Merge "Refactor the lvm barbican job(s): cinderlib-less variant"
diff --git a/.zuul.yaml b/.zuul.yaml
index 36b7446..87f89f0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,6 +8,8 @@
- cinder-tempest-plugin-lvm-lio-barbican-centos-8:
voting: false
- cinder-tempest-plugin-lvm-tgt-barbican
+ - nova-ceph-multistore:
+ voting: false
- cinder-tempest-plugin-cbak-ceph
- cinder-tempest-plugin-basic-victoria
- cinder-tempest-plugin-basic-ussuri
@@ -17,6 +19,11 @@
- cinder-tempest-plugin-lvm-lio-barbican
- cinder-tempest-plugin-lvm-tgt-barbican
- cinder-tempest-plugin-cbak-ceph
+ experimental:
+ jobs:
+ - cinder-tempest-plugin-cbak-ceph-victoria
+ - cinder-tempest-plugin-cbak-ceph-ussuri
+ - cinder-tempest-plugin-cbak-ceph-train
- job:
name: cinder-tempest-plugin-lvm-barbican-base-abstract
@@ -36,7 +43,7 @@
barbican: https://opendev.org/openstack/barbican
vars:
tempest_test_regex: '(^tempest\.(api|scenario)|(^cinder_tempest_plugin))'
- tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-blacklist.txt'
+ tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-exclude-list.txt'
tox_envlist: all
devstack_localrc:
CINDER_LVM_TYPE: thin
@@ -91,7 +98,6 @@
Integration tests that runs with the ceph devstack plugin, py3
and enable the backup service.
vars:
- tempest_black_regex: '(VolumesBackupsTest.test_bootable_volume_backup_and_restore|TestVolumeBackupRestore.test_volume_backup_restore)'
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -100,13 +106,30 @@
devstack_services:
c-bak: true
+- job:
+ name: cinder-tempest-plugin-cbak-ceph-victoria
+ parent: cinder-tempest-plugin-cbak-ceph
+ nodeset: openstack-single-node-focal
+ override-checkout: stable/victoria
+
+- job:
+ name: cinder-tempest-plugin-cbak-ceph-ussuri
+ parent: cinder-tempest-plugin-cbak-ceph
+ nodeset: openstack-single-node-bionic
+ override-checkout: stable/ussuri
+
+- job:
+ name: cinder-tempest-plugin-cbak-ceph-train
+ parent: cinder-tempest-plugin-cbak-ceph
+ nodeset: openstack-single-node-bionic
+ override-checkout: stable/train
+
# variant for pre-Ussuri branches (no volume revert for Ceph),
# should this job be used on those branches
- job:
name: cinder-tempest-plugin-cbak-ceph
branches: ^(?=stable/(ocata|pike|queens|rocky|stein|train)).*$
vars:
- tempest_black_regex: ''
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -137,6 +160,9 @@
This jobs configures Cinder with LVM, tgt, barbican and
runs tempest tests and cinderlib tests.
parent: cinder-tempest-plugin-lvm-barbican-base
+ vars:
+ devstack_localrc:
+ CINDER_ISCSI_HELPER: tgtadm
- job:
name: cinder-tempest-plugin-basic
diff --git a/README.rst b/README.rst
index 79151cd..0254938 100644
--- a/README.rst
+++ b/README.rst
@@ -24,7 +24,6 @@
::
[[local|localrc]]
- VIRT_DRIVER=libvirt
ADMIN_PASSWORD=secret
SERVICE_TOKEN=$ADMIN_PASSWORD
MYSQL_PASSWORD=$ADMIN_PASSWORD
@@ -35,8 +34,8 @@
SYSLOG=False
LOG_COLOR=False
RECLONE=yes
- ENABLED_SERVICES=c-api,c-sch,c-vol,cinder,dstat,g-api,g-reg,key,mysql,
- n-api,n-cond,n-cpu,n-crt,n-net,n-sch,rabbit,tempest
+ ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,key
+ ENABLED_SERVICES+=,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,rabbit,tempest
CINDER_ENABLED_BACKENDS=lvmdriver-1
CINDER_DEFAULT_VOLUME_TYPE=lvmdriver-1
CINDER_VOLUME_CLEAR=none