From 06792f3d28ab87949e7039f019f019281d146ad1 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Mon, 4 May 2020 18:53:00 +0200
Subject: [PATCH] Fix Rocky v2 scenario and grenade jobs

Pin octavia-tempest-plugin to latest Python 2 compatible
octavia-tempest-plugin tag to fix v2 scenario jobs.

Also do not run Tempest in octavia-grenade job.

Change-Id: I2ede4bacd0aa4f97b2e50a8cefda45317289d86c
---
 .../legacy/grenade-devstack-octavia/run.yaml  | 11 +----
 zuul.d/jobs.yaml                              |  1 -
 zuul.d/projects.yaml                          | 40 +++++++++++++++----
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/playbooks/legacy/grenade-devstack-octavia/run.yaml b/playbooks/legacy/grenade-devstack-octavia/run.yaml
index 5dfc25aa41..b0b1a16cdb 100644
--- a/playbooks/legacy/grenade-devstack-octavia/run.yaml
+++ b/playbooks/legacy/grenade-devstack-octavia/run.yaml
@@ -31,28 +31,19 @@
 
           export PROJECTS="openstack/grenade $PROJECTS"
           export PROJECTS="openstack/octavia $PROJECTS"
-          export PROJECTS="openstack/octavia-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-octaviaclient $PROJECTS"
           export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient $DEVSTACK_PROJECT_FROM_GIT"
 
           export GRENADE_PLUGINRC="enable_grenade_plugin octavia https://opendev.org/openstack/octavia"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/octavia-tempest-plugin'"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/etc/octavia/octavia.conf]]"$'\n'"[DEFAULT]"$'\n'"debug = True"
 
-          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_GRENADE=pullup
 
           export BRANCH_OVERRIDE=default
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
-          # Add configuration values for enabling security features in local.conf
-          function pre_test_hook {
-              if [ -f /opt/stack/old/octavia-tempest-plugin/tools/pre_test_hook.sh ] ; then
-                  . /opt/stack/old/octavia-tempest-plugin/tools/pre_test_hook.sh
-              fi
-          }
-          export -f pre_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2e800ad9a8..8eabb4706f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -86,5 +86,4 @@
       - openstack/grenade
       - openstack/devstack-gate
       - openstack/octavia
-      - openstack/octavia-tempest-plugin
       - openstack/python-octaviaclient
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 965a6a211e..84f0cdbe83 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -47,10 +47,22 @@
             voting: false
         - octavia-v1-dsvm-scenario-kvm-centos.7:
             voting: false
-        - octavia-v2-dsvm-noop-api
-        - octavia-v2-dsvm-noop-py35-api
-        - octavia-v2-dsvm-scenario
-        - octavia-v2-dsvm-py35-scenario
+        - octavia-v2-dsvm-noop-api:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
+        - octavia-v2-dsvm-noop-py35-api:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
+        - octavia-v2-dsvm-scenario:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
+        - octavia-v2-dsvm-py35-scenario:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
         - octavia-grenade:
             irrelevant-files:
               - ^.*\.rst$
@@ -90,10 +102,22 @@
         - octavia-v1-dsvm-scenario
         - octavia-v1-dsvm-py3x-scenario
         - neutron-lbaasv2-dsvm-py3x-api
-        - octavia-v2-dsvm-noop-api
-        - octavia-v2-dsvm-noop-py35-api
-        - octavia-v2-dsvm-scenario
-        - octavia-v2-dsvm-py35-scenario
+        - octavia-v2-dsvm-noop-api:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
+        - octavia-v2-dsvm-noop-py35-api:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
+        - octavia-v2-dsvm-scenario:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
+        - octavia-v2-dsvm-py35-scenario:
+            required-projects:
+              - name: openstack/octavia-tempest-plugin
+                override-checkout: 1.4.0
         - octavia-grenade:
             irrelevant-files:
               - ^.*\.rst$