From 968ba6b6c6f2a3cb4ac030609a78d6d99764bbde Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 22 Mar 2019 12:21:34 -0500
Subject: [PATCH] Switch to new DevStack base job

Rename stx-devstack-update to flock-devstack-update
and inherit from flock-devstack-base-min

Story: 2005285
Depends-on: https://review.openstack.org/#/c/645808/
Change-Id: I2c4bd243636dd3a469de3bbda7cd42aff333798a
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml | 46 +++++++---------------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index c0149d58..64b68ff7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,21 +6,21 @@
       jobs:
         - build-openstack-api-ref
         - build-openstack-releasenotes
+        - flock-devstack-update
         - openstack-tox-linters
         - openstack-tox-pep8
         - openstack-tox-py27
         - openstack-tox-py37
         - stx-updates-pylint
-        - stx-devstack-update
     gate:
       jobs:
         - build-openstack-api-ref
         - build-openstack-releasenotes
+        - flock-devstack-update
         - openstack-tox-linters
         - openstack-tox-pep8
         - openstack-tox-py27
         - openstack-tox-py37
-        - stx-updates-pylint
     post:
       jobs:
         - publish-stx-api-ref
@@ -36,48 +36,16 @@
       - openstack/stx-integ
 
 - job:
-    name: stx-devstack-update
-    parent: stx-devstack-base
-    timeout: 7800
+    name: flock-devstack-update
+    parent: flock-devstack-base-min
     required-projects:
-      - openstack/stx-fault
+      - openstack/stx-integ
     vars:
       tox_envlist: functional
       devstack_services:
-        # Cinder services
-        c-api: false
-        c-bak: false
-        c-sch: false
-        c-vol: false
-        cinder: false
-        # Glance services
-        g-api: false
-        g-reg: false
-        # Nova services
-        n-api: false
-        n-api-meta: false
-        n-cauth: false
-        n-cond: false
-        n-cpu: false
-        n-novnc: false
-        n-obj: false
-        n-sch: false
-        placement-api: false
-        # Neutron services
-        q-agt: true
-        q-dhcp: false
-        q-l3: false
-        q-meta: false
-        q-metering: false
-        q-svc: false
-        horizon: false
         # StarlingX services
         sw-patch: true
         tsconfig: true
       devstack_plugins:
-        stx-fault: git://git.starlingx.io/stx-fault
-        stx-update: git://git.starlingx.io/stx-update
-      devstack_localrc:
-        LIBS_FROM_GIT: keystone
-    files:
-      - ^devstack/.*
+        stx-integ: https://git.starlingx.io/stx-integ
+        stx-update: https://git.starlingx.io/stx-update