From dbeb2b12b79ebd37314d7e3ab38f0d59d25631fa Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Sat, 23 Mar 2019 14:23:08 -0500
Subject: [PATCH] Switch to new DevStack base job

* Rename stx-devstack-config to flock-devstack-config
  and inherit from flock-devstack-base
* Make devstack jobs voting

Story: 2005285
Change-Id: Ic8970f6c747a8b1ef3796db3810f4e81c67f0d32
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 3de2832307..fc0ff3ac44 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
       jobs:
         - build-openstack-api-ref
         - build-openstack-releasenotes
+        - flock-devstack-config
         - openstack-tox-linters
         - sysinv-tox-py27
         - sysinv-tox-py35
@@ -16,8 +17,6 @@
         - controllerconfig-tox-pylint
         - configutilities-tox-flake8
         - configutilities-tox-pylint
-        - stx-devstack-config:
-            voting: false
         - cgtsclient-tox-py27
         - cgtsclient-tox-pep8
         - cgtsclient-tox-pylint
@@ -27,6 +26,7 @@
       jobs:
         - build-openstack-api-ref
         - build-openstack-releasenotes
+        - flock-devstack-config
         - openstack-tox-linters
         - sysinv-tox-py27
         - sysinv-tox-py35
@@ -165,22 +165,18 @@
       tox_extra_args: -c configutilities/configutilities/tox.ini
 
 - job:
-    name: stx-devstack-config
-    parent: stx-devstack-base
-    timeout: 7800
+    name: flock-devstack-config
+    parent: flock-devstack-base
     required-projects:
-      - openstack/stx-update
       - openstack/stx-fault
       - openstack/stx-integ
+      - openstack/stx-update
     vars:
       tox_envlist: functional
       devstack_services:
-        horizon: false
         # StarlingX services
         fm-common: true
         fm-api: true
-        # fm-rest-api: true
-        # fm-mgr: true
         cgtsclient: true
         sysinv-agent: true
         # Skip sysinv-api for now, needs more attention
@@ -188,12 +184,10 @@
         sysinv-cond: true
         tls-proxy: false
       devstack_plugins:
-        stx-config: git://git.starlingx.io/stx-config
-        stx-fault: git://git.starlingx.io/stx-fault
-        stx-integ: git://git.starlingx.io/stx-integ
-        stx-update: git://git.starlingx.io/stx-update
-    files:
-      - ^devstack/.*
+        stx-config: https://git.starlingx.io/stx-config
+        stx-fault: https://git.starlingx.io/stx-fault
+        stx-integ: https://git.starlingx.io/stx-integ
+        stx-update: https://git.starlingx.io/stx-update
 
 - job:
     name: cgtsclient-tox-py27