From d10df8c008d06045eb616bb2e8ccf82ce8e54ee1 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Tue, 25 Feb 2020 23:11:09 +0100
Subject: [PATCH] Native Zuul v3 cinder-grenade jobs

Specialize the grenade-multinode job and test the variations
on upgrade where a few services are available on the subnode only
(c-bak only, c-bak+c-vol, c-bak+c-sch+c-vol).

This backport does not switch to grenade in place of grenade-py3,
as Python 2 is supported on this branch and both version of
the grenade job are needed. It switched from neutron-grenade
to grenade, though.

Conflicts:
	.zuul.yaml
(due to some expected changes in the job structure.)

Depends-On: https://review.opendev.org/548936
Change-Id: I3eac1afcbb69e25e9b2a916910caf3291aa7c1fe
(cherry picked from commit 6c1e52cefcf93700fc13c124b45a5fa991261486)
(cherry picked from commit cf5eaae596efbeb4e41500c1dd2825541e1e8252)
---
 .zuul.yaml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 6d931c790c0..66eb24f2593 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -52,8 +52,7 @@
             irrelevant-files: *functional-irrelevant-files
         - cinder-tempest-plugin-lvm-lio-barbican:
             irrelevant-files: *gate-irrelevant-files
-        - legacy-grenade-dsvm-cinder-mn-sub-volbak:
-            voting: false
+        - cinder-grenade-mn-sub-volbak:
             irrelevant-files: *gate-irrelevant-files
         - cinder-tempest-lvm-multibackend:
             voting: false
@@ -61,7 +60,7 @@
         - devstack-plugin-nfs-tempest-full:
             voting: false
             irrelevant-files: *gate-irrelevant-files
-        - neutron-grenade:
+        - grenade:
             irrelevant-files: *gate-irrelevant-files
         - tempest-slow-py3:
             irrelevant-files: *gate-irrelevant-files
@@ -75,9 +74,9 @@
             irrelevant-files: *gate-irrelevant-files
     gate:
       jobs:
-        - legacy-grenade-dsvm-cinder-mn-sub-volbak:
+        - cinder-grenade-mn-sub-volbak:
             irrelevant-files: *gate-irrelevant-files
-        - neutron-grenade:
+        - grenade:
             irrelevant-files: *gate-irrelevant-files
         - tempest-full:
             irrelevant-files: *gate-irrelevant-files
@@ -93,9 +92,9 @@
             irrelevant-files: *gate-irrelevant-files
         - legacy-tempest-dsvm-multibackend-matrix:
             irrelevant-files: *gate-irrelevant-files
-        - legacy-grenade-dsvm-cinder-mn-sub-volschbak:
+        - cinder-grenade-mn-sub-volschbak:
             irrelevant-files: *gate-irrelevant-files
-        - legacy-grenade-dsvm-cinder-mn-sub-bak:
+        - cinder-grenade-mn-sub-bak:
             irrelevant-files: *gate-irrelevant-files
         - devstack-plugin-ceph-tempest-py3:
             irrelevant-files: *gate-irrelevant-files
@@ -144,6 +143,80 @@
       zuul_additional_subunit_dirs:
         - "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
 
+- job:
+    name: cinder-grenade-mn-sub-bak
+    parent: grenade-multinode
+    description: |
+      Cinder grenade multinode job where cinder-backup only runs
+      on the subnode.
+      It tests the new c-api, c-sch, c-vol (on the controller node)
+      with the old c-bak (on the subnode).
+      Former names for this job were:
+        * cinder-grenade-dsvm-mn-sub-bak
+        * legacy-grenade-dsvm-cinder-mn-sub-bak
+    required-projects:
+      - opendev.org/openstack/grenade
+      - opendev.org/openstack/cinder
+    vars:
+      devstack_services:
+        c-bak: false
+        c-vol: true
+    group-vars:
+      subnode:
+        devstack_services:
+          c-bak: true
+          c-vol: false
+
+- job:
+    name: cinder-grenade-mn-sub-volbak
+    parent: grenade-multinode
+    description: |
+      Cinder grenade multinode job where cinder-backup and cinder-volume
+      only run on the subnode.
+      It tests the new c-api, c-sch (on the controller node)
+      with the old c-bak, c-vol (on the subnode).
+      Former names for this job were:
+        * cinder-grenade-dsvm-mn-sub-volbak
+        * legacy-grenade-dsvm-cinder-mn-sub-volbak
+    required-projects:
+      - opendev.org/openstack/grenade
+      - opendev.org/openstack/cinder
+    vars:
+      devstack_services:
+        c-bak: false
+        c-vol: false
+    group-vars:
+      subnode:
+        devstack_services:
+          c-bak: true
+          c-vol: true
+
+- job:
+    name: cinder-grenade-mn-sub-volschbak
+    parent: grenade-multinode
+    description: |
+      Cinder grenade multinode job where cinder-backup, cinder-volume
+      and cinder-scheduler only run on the subnode.
+      It tests the new c-api (on the controller node)
+      with the old c-bak, c-sch, c-vol (on the subnode).
+      Former names for this job were:
+        * cinder-grenade-dsvm-mn-sub-volschbak
+        * legacy-grenade-dsvm-cinder-mn-sub-volschbak
+    required-projects:
+      - opendev.org/openstack/grenade
+      - opendev.org/openstack/cinder
+    vars:
+      devstack_services:
+        c-bak: false
+        c-sch: false
+        c-vol: false
+    group-vars:
+      subnode:
+        devstack_services:
+          c-bak: true
+          c-sch: true
+          c-vol: true
+
 - job:
     name: cinder-tempest-lvm-multibackend
     parent: devstack-tempest