Separate StorPool release/testing; add new jobs for storpool-experiments
Change-Id: I325009b7c6b799096291194db89b3be38c2d3d55
diff --git a/playbooks/setup-openstack-storpool/pre.yaml b/playbooks/setup-openstack-storpool/pre.yaml
index a943687..0d8a842 100644
--- a/playbooks/setup-openstack-storpool/pre.yaml
+++ b/playbooks/setup-openstack-storpool/pre.yaml
@@ -452,7 +452,15 @@
- name: Deploy StorPool
ansible.builtin.command:
- argv: ["ansible-playbook", "playbook.yml", "-i", "inventory.yaml", "--skip-tags", "perform-tests"]
+ argv:
+ - "ansible-playbook"
+ - "playbook.yml"
+ - "-i"
+ - "inventory.yaml"
+ - "--skip-tags"
+ - "perform-tests"
+ - "--extra-vars"
+ - "sp_target_release={{ sp_target_release }}"
args:
chdir: "{{ storpool_ansible_dir }}"
diff --git a/playbooks/setup-openstack-storpool/vars.yaml b/playbooks/setup-openstack-storpool/vars.yaml
index 983afb8..3db7b9d 100644
--- a/playbooks/setup-openstack-storpool/vars.yaml
+++ b/playbooks/setup-openstack-storpool/vars.yaml
@@ -1,4 +1,5 @@
# storpool_connection: "block"/"iscsi"
+# sp_target_release: "release"
storpool_node: "{{ hostvars['lab-sp-a1']['nodepool']['external_id'] }}"
storpool_node_ip: "{{ hostvars['lab-sp-a1']['nodepool']['interface_ip'] }}"
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 34ba864..7df69a5 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -81,6 +81,7 @@
vars:
os_venv: "~/sp-venv-openstack"
storpool_connection: "block"
+ sp_target_release: "release"
do_storprep: true
devstack_localrc:
@@ -115,6 +116,13 @@
# (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
- job:
+ name: cinder-storpool-tempest-testing
+ parent: cinder-storpool-tempest
+ vars:
+ sp_target_release: "testing"
+
+
+- job:
name: cinder-storpool-tempest-experimental
parent: cinder-storpool-tempest
vars:
@@ -208,6 +216,7 @@
vars:
os_venv: "~/sp-venv-openstack"
storpool_connection: "iscsi"
+ sp_target_release: "release"
zuul_copy_output:
/etc/multipath.conf: logs_txt
@@ -269,6 +278,14 @@
# ^cinder_tempest_plugin
# (^(tempest\.((api\..*volume)|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance))|(cinder_tempest_plugin))
+
+- job:
+ name: cinder-storpool-tempest-iscsi-multipath-testing
+ parent: cinder-storpool-tempest-iscsi-multipath
+ vars:
+ sp_target_release: "testing"
+
+
- job:
name: kolla-cinder-storpool-tempest-iscsi-multipath
pre-run:
@@ -321,6 +338,7 @@
vars:
os_venv: "~/sp-venv-openstack"
storpool_connection: "iscsi"
+ sp_target_release: "release"
zuul_copy_output:
/etc/multipath.conf: logs_txt
@@ -331,6 +349,12 @@
tempest_test_regex: volume
+- job:
+ name: kolla-cinder-storpool-tempest-iscsi-multipath-testing
+ parent: kolla-cinder-storpool-tempest-iscsi-multipath
+ vars:
+ sp_target_release: "testing"
+
- project:
name: openstack/cinder
check:
@@ -359,3 +383,14 @@
jobs:
- kolla-cinder-storpool-tempest-iscsi-multipath:
branches: master
+
+- project:
+ name: storpool-experiments
+ check:
+ jobs:
+ - cinder-storpool-tempest-testing:
+ branches: master
+ - cinder-storpool-tempest-iscsi-multipath-testing:
+ branches: master
+ - kolla-cinder-storpool-tempest-iscsi-multipath-testing:
+ branches: master
\ No newline at end of file