zuul: fixes for the A/A job (nodeset, variables)

- set the parent job to the multinode variant of the base
  devstack-plugin-ceph tempest job. This way the nodeset
  is set automatically based on what devstack supports
  (currently focal, instead of the replaced bionic);
- set the devstack variable TEMPEST_VOLUME_REVERT_TO_SNAPSHOT
  (available since stein) instead of directly setting
  the tempest configuration.

Change-Id: Ic32d56b2f3a2c3f1f3345ba49f7b82b6c344f9f4
(cherry picked from commit 2c2370671b)
(cherry picked from commit f05fec7c4d)
This commit is contained in:
Luigi Toscano 2021-05-05 09:25:36 +02:00
parent ba1d2574a1
commit 7e87c5450e
1 changed files with 3 additions and 6 deletions

View File

@ -161,8 +161,7 @@
- job: - job:
name: cinder-plugin-ceph-tempest-mn-aa name: cinder-plugin-ceph-tempest-mn-aa
nodeset: openstack-two-node-bionic parent: devstack-plugin-ceph-multinode-tempest-py3
parent: devstack-plugin-ceph-tempest-py3
roles: roles:
- zuul: opendev.org/openstack/cinderlib - zuul: opendev.org/openstack/cinderlib
- zuul: opendev.org/openstack/cinder-tempest-plugin - zuul: opendev.org/openstack/cinder-tempest-plugin
@ -173,15 +172,13 @@
vars: vars:
zuul_additional_subunit_dirs: zuul_additional_subunit_dirs:
- "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}" - "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
devstack_localrc:
TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: True
devstack_local_conf: devstack_local_conf:
post-config: post-config:
$CINDER_CONF: $CINDER_CONF:
DEFAULT: DEFAULT:
cluster: ceph cluster: ceph
test-config:
$TEMPEST_CONFIG:
volume-feature-enabled:
volume_revert: True
- job: - job:
name: cinder-grenade-mn-sub-bak name: cinder-grenade-mn-sub-bak