From a84e7ae506cbe72bbf13589d3573acf4cbfd9af8 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Tue, 6 Feb 2018 16:53:36 -0500
Subject: [PATCH] Address comments from
 I51adbbdf13711e463b4d25c2ffd4a3123cd65675

- renames the base job that is for dsvm jobs
- removes the unused legacy branch override stuff
- moves the comment about keeping the jobs sorted

Change-Id: Idf20864fe3371e4bbafb8c18bcf979a8f3c3eb62
---
 .zuul.yaml                                 | 11 ++++++-----
 playbooks/legacy/nova-lvm/run.yaml         |  4 ----
 playbooks/legacy/nova-multiattach/run.yaml |  4 ----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8c7d88bdb4..930a1583aa 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,10 +1,11 @@
 # See https://docs.openstack.org/infra/manual/drivers.html#naming-with-zuul-v3
 # for job naming conventions.
 - job:
-    name: nova-base
+    name: nova-dsvm-base
     parent: legacy-dsvm-base
     description: |
-      The base job definition for nova jobs. Contains common configuration.
+      The base job definition for nova devstack/tempest jobs.
+      Contains common configuration.
     timeout: 10800
     required-projects:
       - openstack-infra/devstack-gate
@@ -63,7 +64,7 @@
 
 - job:
     name: nova-lvm
-    parent: nova-base
+    parent: nova-dsvm-base
     description: |
       Run standard integration tests using LVM image backend. This is useful if
       there are tests touching this code.
@@ -72,7 +73,7 @@
 
 - job:
     name: nova-multiattach
-    parent: nova-base
+    parent: nova-dsvm-base
     description: |
       Run tempest integration tests with volume multiattach support enabled.
       This job will only work starting with Queens.
@@ -86,6 +87,7 @@
     post-run: playbooks/legacy/nova-multiattach/post.yaml
 
 - project:
+    # Please try to keep the list of job names sorted alphabetically.
     check:
       jobs:
         - nova-multiattach
@@ -98,5 +100,4 @@
         - nova-tox-functional-py35
     experimental:
       jobs:
-        # Please try to keep this list of job names sorted alphabetically.
         - nova-lvm
diff --git a/playbooks/legacy/nova-lvm/run.yaml b/playbooks/legacy/nova-lvm/run.yaml
index 5b032b2378..4f9ff00b2d 100644
--- a/playbooks/legacy/nova-lvm/run.yaml
+++ b/playbooks/legacy/nova-lvm/run.yaml
@@ -43,10 +43,6 @@
           set -x
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
 
           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-lvm-rc
 
diff --git a/playbooks/legacy/nova-multiattach/run.yaml b/playbooks/legacy/nova-multiattach/run.yaml
index 66131722e3..bf96cb555b 100644
--- a/playbooks/legacy/nova-multiattach/run.yaml
+++ b/playbooks/legacy/nova-multiattach/run.yaml
@@ -47,10 +47,6 @@
           # Only run compute API tests; note that this will need to
           # be updated if multiattach scenario tests are ever added.
           export DEVSTACK_GATE_TEMPEST_REGEX="api.compute"
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
         executable: /bin/bash