cinder: only apply the experimental patches for the exp job!
Add the sp_experimental variable and use it to differentiate between
the two jobs.
Change-Id: I0a803ec87149efe8bed398b9491755471f0f5ecc
diff --git a/playbooks/sp-init.yaml b/playbooks/sp-init.yaml
index 05914f8..fe7fa20 100644
--- a/playbooks/sp-init.yaml
+++ b/playbooks/sp-init.yaml
@@ -44,8 +44,17 @@
- name: Apply the StorPool patches
shell:
+ cmd: /home/zuul/src/spfactory.storpool.com/sp-osci/tools/bin/git-if-needed -s /home/zuul/src/spfactory.storpool.com/sp-osci/patches/series -S am
+ chdir: /opt/stack
+ when: sp_experimental is not defined or not sp_experimental
+ become: true
+ become_user: stack
+
+ - name: Apply the StorPool experimental patches
+ shell:
cmd: /home/zuul/src/spfactory.storpool.com/sp-osci/tools/bin/git-if-needed -s /home/zuul/src/spfactory.storpool.com/sp-osci/patches/series.experimental -S am
chdir: /opt/stack
+ when: sp_experimental is defined and sp_experimental
become: true
become_user: stack
@@ -53,6 +62,13 @@
shell:
cmd: /home/zuul/src/spfactory.storpool.com/sp-osci/tools/bin/git-if-needed -s /home/zuul/src/spfactory.storpool.com/sp-osci/patches/series.experimental am
chdir: /home/zuul/src/opendev.org
+ when: sp_experimental is not defined or not sp_experimental
+
+ - name: Apply the StorPool experimental patches to the other place
+ shell:
+ cmd: /home/zuul/src/spfactory.storpool.com/sp-osci/tools/bin/git-if-needed -s /home/zuul/src/spfactory.storpool.com/sp-osci/patches/series.experimental am
+ chdir: /home/zuul/src/opendev.org
+ when: sp_experimental is defined and sp_experimental
# - name: Set up the random StorPool volume prefix
# shell:
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 9b7b8a6..7edbeb9 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -44,6 +44,7 @@
name: cinder-storpool-tempest-iscsi
parent: cinder-storpool-tempest
vars:
+ sp_experimental: false
devstack_localrc:
# cfg: iscsi
TEMPEST_STORAGE_PROTOCOL: iscsi