From 2e1ab6e60732b9f67b7cadf9fb617c837250f6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Fri, 12 Jun 2020 21:33:22 +0200
Subject: [PATCH] CI: Move NFV reqs installation to where it belongs

This ought to fix #1864238 for the stable branches.

Adapted for Stein to make NFV jobs trigger.

Change-Id: I218905247a4a4003ecfc2c9ab3e47767bb5ab33e
Related-bug: #1864238
---
 tests/test-scenario-nfv.sh | 6 ------
 tools/setup_gate.sh        | 3 +++
 zuul.d/project.yaml        | 4 +++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/test-scenario-nfv.sh b/tests/test-scenario-nfv.sh
index 8388ed3cec..af9f382023 100755
--- a/tests/test-scenario-nfv.sh
+++ b/tests/test-scenario-nfv.sh
@@ -48,16 +48,10 @@ function test_heat {
     openstack stack list
 }
 
-function install_requirements {
-    echo "TESTING: Install requirements"
-    pip install "python-tackerclient" "python-heatclient" "networking-sfc" "python-mistralclient" "python-barbicanclient"
-}
-
 function test_scenario_nfv_logged {
     . /etc/kolla/admin-openrc.sh
     . ~/openstackclient-venv/bin/activate
 
-    install_requirements
     test_tacker
     test_barbican
     test_mistral
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index a2e0d99de1..cd758e2fc4 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -17,6 +17,9 @@ function setup_openstack_clients {
     if [[ $ACTION == ironic ]]; then
         packages+=(python-ironicclient)
     fi
+    if [[ $SCENARIO == scenario_nfv ]]; then
+        packages+=(python-tackerclient python-barbicanclient python-mistralclient)
+    fi
     virtualenv ~/openstackclient-venv
     ~/openstackclient-venv/bin/pip install -U pip
     ~/openstackclient-venv/bin/pip install -c $UPPER_CONSTRAINTS ${packages[@]}
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 40aaaca553..9675400167 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,7 +26,9 @@
         - kolla-ansible-ubuntu-source-zun:
             files: ^ansible\/roles\/(zun|kuryr)\/.*
         - kolla-ansible-centos-source-scenario-nfv:
-            files: ^ansible\/roles\/(barbican|heat|mistral|redis|tacker)\/.*
+            files:
+              - ^ansible/roles/(barbican|heat|mistral|redis|tacker)/
+              - ^tests/test-scenario-nfv.sh
         - kolla-ansible-centos-source-ironic
         - kolla-ansible-centos-binary-ironic
         - kolla-ansible-ubuntu-source-ironic