From 6ea9300837c56e271ec2583b0195ab194abac2fe Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Fri, 17 Apr 2020 13:52:39 +0200
Subject: [PATCH] Test against stable/train with DevStack and CentOS 7

Change-Id: Iac38809c717c7e0c19a19fa59ff22c428daba2b4
---
 devstack/plugin.sh          | 7 +++++--
 zuul.d/project.yaml         | 2 +-
 zuul.d/tobiko-devstack.yaml | 8 ++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 062674e51..4debe54ba 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -4,8 +4,11 @@ TOBIKO_PLUGIN_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function install_tobiko {
   echo_summary "Installing tobiko-plugin"
-  install_python3
-  setup_dev_lib ${TOBIKO_BINDEP} tobiko
+
+  if [ "${TOBIKO_BINDEP}" != "" ]; then
+    install_python3
+    install_bindep "${TOBIKO_DIR}/bindep.txt" test
+  fi
 }
 
 
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f8b264181..e08fe197e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,7 +16,7 @@
         - tobiko-tox-py36-centos-8
         - tobiko-tox-py38-centos-8
         - tobiko-devstack-functional
-        - tobiko-devstack-faults-centos-7
+        - tobiko-devstack-faults-centos-7-train
         - tobiko-devstack-faults-ubuntu-bionic
         - tobiko-tox-infrared-centos-7
         - tobiko-tox-infrared-centos-8
diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml
index b9af5c060..be276ffe3 100644
--- a/zuul.d/tobiko-devstack.yaml
+++ b/zuul.d/tobiko-devstack.yaml
@@ -229,6 +229,14 @@
     parent: tobiko-devstack-faults-centos-7
     override-checkout: stable/train
     voting: false
+    vars:
+      devstack_services:
+        # Disable Octavia services
+        octavia: false
+        o-cw: false
+        o-hk: false
+        o-hm: false
+        o-api: false
 
 
 - job: