From 5b31777212ca9350ba32278883b8d3bfbefd879e Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 25 Mar 2019 09:28:48 -0500
Subject: [PATCH] Switch to new DevStack base job

Rename stx-devstack-metal to flock-devstack-metal
and inherit from flock-devstack-base

Change-Id: I7bb8a5fe4865def69e80a3c5347ee31b06073e22
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 665404c0..c809b6ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,14 +6,14 @@
       jobs:
         - build-openstack-api-ref
         - build-openstack-releasenotes
+        - flock-devstack-metal
         - openstack-tox-linters
         - openstack-tox-pep8
-        - stx-devstack-metal:
-            voting: false
     gate:
       jobs:
         - build-openstack-api-ref
         - build-openstack-releasenotes
+        - flock-devstack-metal
         - openstack-tox-linters
         - openstack-tox-pep8
     post:
@@ -23,19 +23,18 @@
         - publish-stx-releasenotes
 
 - job:
-    name: stx-devstack-metal
-    parent: stx-devstack-base
-    timeout: 7800
+    name: flock-devstack-metal
+    parent: flock-devstack-base
     required-projects:
       - openstack/barbican
       - openstack/python-barbicanclient
-      - openstack/stx-update
       - openstack/stx-fault
+      - openstack/stx-integ
       - openstack/stx-nfv
+      - openstack/stx-update
     vars:
       tox_envlist: functional
       devstack_services:
-        horizon: false
         # StarlingX services
         fm-common: true
         # fm-api: true
@@ -55,9 +54,8 @@
         rmon: true
       devstack_plugins:
         barbican: https://git.openstack.org/openstack/barbican
-        stx-fault: git://git.starlingx.io/stx-fault
-        stx-metal: git://git.starlingx.io/stx-metal
-        stx-nfv: git://git.starlingx.io/stx-nfv
-        stx-update: git://git.starlingx.io/stx-update
-    files:
-      - ^devstack/.*
+        stx-fault: https:://git.starlingx.io/stx-fault
+        stx-integ: https://git.starlingx.io/stx-integ
+        stx-metal: https:://git.starlingx.io/stx-metal
+        stx-nfv: https:://git.starlingx.io/stx-nfv
+        stx-update: https:://git.starlingx.io/stx-update