From 4edfc94285d32cbfb85fd3e15d082212e4e7bb11 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 22 Mar 2019 12:04:39 -0500
Subject: [PATCH] Add new base DevStack job

* move the base stx-devstack job to stx-integ, renamed as
  flock-devstack-base
* add a new flock-devstack-base-min job that also disables
  most of OpenStack services to seed things up when they
  are not required

Story: 2005285
Change-Id: Idf30735b7b091eca03a5e9cd321b99115c9fca65
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml | 73 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8c56ce2b1..0aa44ab3c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,31 +5,68 @@
     check:
       jobs:
         - build-openstack-releasenotes
+        - flock-devstack-integ
         - openstack-tox-pep8
         - openstack-tox-linters
         - stx-integ-pylint
-        - stx-devstack-integ
     gate:
       jobs:
         - build-openstack-releasenotes
+        - flock-devstack-integ
         - openstack-tox-pep8
         - openstack-tox-linters
         - stx-integ-pylint
-        - stx-devstack-integ
     post:
       jobs:
         - publish-stx-tox
         - publish-stx-releasenotes
 
+
+# This is the common base job definition for StarlingX flock services
 - job:
-    name: stx-devstack-integ
-    parent: stx-devstack-base
-    timeout: 7800
+    name: flock-devstack-base
+    parent: devstack
+    description: |
+      Base job for StarlingX Flock components DevStack tests
+    nodeset: openstack-single-node-bionic
+    roles:
+      - zuul: openstack-infra/devstack
+    timeout: 9000
     required-projects:
-      - openstack/stx-fault
-      - openstack/stx-update
+      - name: openstack-dev/devstack
+      - name: openstack/keystone
+      - name: openstack/requirements
+    vars:
+      devstack_services:
+        ceilometer-acentral: false
+        ceilometer-acompute: false
+        ceilometer-alarm-evaluator: false
+        ceilometer-alarm-notifier: false
+        ceilometer-anotification: false
+        ceilometer-api: false
+        ceilometer-collector: false
+        horizon: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        tempest: false
+        # Database
+        mysql: false
+        postgresql: true
+      devstack_localrc:
+        # LIBS_FROM_GIT: keystone
+        FORCE: yes
+
+# A minimal base job that eliminates most OpenStack services
+# Leave Celiometer, Horizon and Swift in the base since none
+# of our jobs need them.
+- job:
+    name: flock-devstack-base-min
+    parent: flock-devstack-base
+    timeout: 7800
     vars:
-      tox_envlist: functional
       devstack_services:
         # Cinder services
         c-api: false
@@ -57,17 +94,21 @@
         q-meta: false
         q-metering: false
         q-svc: false
-        horizon: false
+
+- job:
+    name: flock-devstack-integ
+    parent: flock-devstack-base-min
+    timeout: 7800
+    required-projects:
+      - openstack/stx-update
+    vars:
+      tox_envlist: functional
+      devstack_services:
         # StarlingX services
         platform-util: true
       devstack_plugins:
-        stx-fault: git://git.starlingx.io/stx-fault
-        stx-integ: git://git.starlingx.io/stx-integ
-        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
 
 - job:
     name: stx-integ-pylint