From 4bb9d5d5a0cf2640508076cbb17cb551e868017a Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Tue, 17 Jul 2018 09:10:55 -0400
Subject: [PATCH] Install mistral-lib as a sibling for tox jobs

If mistral-lib is not processed as a required-project, it won't get
treated properly as a depends-on. This should fix that.

Change-Id: I1f42836ec549a3e56681af29738868bf5896e971
---
 .zuul.yaml         | 21 ++++++++++++++++++++-
 devstack/plugin.sh |  7 +++++++
 devstack/settings  |  4 ++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index dc910103a..e08a49ca2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -25,6 +25,7 @@
       - openstack/mistral
       - openstack/python-mistralclient
       - openstack/mistral-tempest-plugin
+      - openstack/mistral-lib
 
 - job:
     name: mistral-rally-task
@@ -65,6 +66,9 @@
     parent: openstack-tox
     vars:
       tox_envlist: unit-mysql
+    timeout: 3600
+    required-projects:
+      - openstack/mistral-lib
 
 - job:
     name: mistral-tox-unit-postgresql
@@ -72,12 +76,25 @@
     vars:
       tox_envlist: unit-postgresql
       tox_environment: { CI_PROJECT: "{{ zuul['project']['name'] }}" }
+    timeout: 3600
+    required-projects:
+      - openstack/mistral-lib
 
 - project:
     check:
       jobs:
         - openstack-tox-cover:
             voting: false
+            irrelevant-files:
+              - ^.zuul.yaml$
+            required-projects:
+              - openstack/mistral-lib
+        - openstack-tox-py35:
+            required-projects:
+              - openstack/mistral-lib
+        - openstack-tox-py27:
+            required-projects:
+              - openstack/mistral-lib
         - mistral-devstack
         - mistral-devstack-non-apache:
             branches: ^(?!stable/(newton|ocata)).*$
@@ -96,7 +113,9 @@
         - tripleo-ci-centos-7-scenario003-multinode-oooq
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container
         - mistral-rally-task
-        - openstack-tox-lower-constraints
+        - openstack-tox-lower-constraints:
+            required-projects:
+              - openstack/mistral-lib
     gate:
       jobs:
         - mistral-devstack
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e947f9a61..0d7f641ab 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -148,6 +148,12 @@ function install_mistral_pythonclient {
     fi
 }
 
+function install_mistral_lib {
+    if use_library_from_git "mistral-lib"; then
+        git_clone $MISTRAL_LIB_REPO $MISTRAL_LIB_DIR $MISTRAL_LIB_BRANCH
+        setup_develop $MISTRAL_LIB_DIR
+    fi
+}
 
 # start_mistral - Start running processes
 function start_mistral {
@@ -237,6 +243,7 @@ if is_service_enabled mistral; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing mistral"
         install_mistral
+        install_mistral_lib
         install_mistral_pythonclient
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring mistral"
diff --git a/devstack/settings b/devstack/settings
index 39f8ff9fa..5f8c6032f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -23,6 +23,10 @@ MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/pyt
 MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-master}
 MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
 
+MISTRAL_LIB_REPO=${MISTRAL_LIB_REPO:-${GIT_BASE}/openstack/mistral-lib.git}
+MISTRAL_LIB_BRANCH=${MISTRAL_LIB_BRANCH:-master}
+MISTRAL_LIB_DIR=$DEST/mistral-lib
+
 # Set up default directories
 MISTRAL_DIR=$DEST/mistral
 MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard