Merge "Add stable branch jobs on the plugins master gate"
diff --git a/.zuul.yaml b/.zuul.yaml
index 9f734ae..141b282 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,6 +5,8 @@
check:
jobs:
- cinder-tempest-plugin-lvm-lio-barbican
+ - cinder-tempest-plugin-lvm-lio-barbican-centos-8:
+ voting: false
- cinder-tempest-plugin-lvm-tgt-barbican
- cinder-tempest-plugin-cbak-ceph
- cinder-tempest-plugin-basic-ussuri
@@ -98,6 +100,14 @@
CINDER_ISCSI_HELPER: lioadm
- job:
+ name: cinder-tempest-plugin-lvm-lio-barbican-centos-8
+ parent: cinder-tempest-plugin-lvm-lio-barbican
+ nodeset: devstack-single-node-centos-8
+ description: |
+ This jobs configures Cinder with LVM, LIO, barbican and
+ runs tempest tests and cinderlib tests on CentOS 8.
+
+- job:
name: cinder-tempest-plugin-lvm-tgt-barbican
description: |
This jobs configures Cinder with LVM, tgt, barbican and
diff --git a/playbooks/tempest-and-cinderlib-run.yaml b/playbooks/tempest-and-cinderlib-run.yaml
index 5dddf7f..ff99d08 100644
--- a/playbooks/tempest-and-cinderlib-run.yaml
+++ b/playbooks/tempest-and-cinderlib-run.yaml
@@ -19,10 +19,15 @@
- setup-tempest-data-dir
- acl-devstack-files
- role: run-tempest
- # ignore the errors, so that run-cinderlib-tests is always executed
+ # ignore the errors for now, so that run-cinderlib-tests is always executed
ignore_errors: yes
- role: change-devstack-data-owner
devstack_data_subdir_changed: cinder
devstack_data_subdir_owner: zuul
- role: run-cinderlib-tests
cinderlib_base_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
+ post_tasks:
+ - name: Fail if the first tempest run did not work
+ fail:
+ msg: "tempest run returned with an error"
+ when: tempest_run_result is defined and tempest_run_result.rc != 0
diff --git a/test-requirements.txt b/test-requirements.txt
index bd50458..e0bd682 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=3.0,<3.1 # Apache-2.0
+hacking>=3.0.1,<3.1 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD