From f05fec7c4df6cabbaac38e1b16303d90eda95255 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Wed, 5 May 2021 09:25:36 +0200
Subject: [PATCH] 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 2c2370671b8eeada8bef851d952dd65fa8145ed4)
---
 .zuul.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 78c7f019261..bdd3469d0bd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -163,8 +163,7 @@
 
 - job:
     name: cinder-plugin-ceph-tempest-mn-aa
-    nodeset: openstack-two-node-bionic
-    parent: devstack-plugin-ceph-tempest-py3
+    parent: devstack-plugin-ceph-multinode-tempest-py3
     roles:
       - zuul: opendev.org/openstack/cinderlib
       - zuul: opendev.org/openstack/cinder-tempest-plugin
@@ -175,15 +174,13 @@
     vars:
       zuul_additional_subunit_dirs:
         - "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
+      devstack_localrc:
+        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: True
       devstack_local_conf:
         post-config:
           $CINDER_CONF:
             DEFAULT:
               cluster: ceph
-        test-config:
-          $TEMPEST_CONFIG:
-            volume-feature-enabled:
-              volume_revert: True
 
 - job:
     name: cinder-grenade-mn-sub-bak