openstack/mistral
Code Issues Proposed changes

Merge "Install mistral-lib as a sibling for tox jobs"

Browse Source
This commit is contained in:
Zuul 2018-07-23 10:52:50 +00:00 committed by Gerrit Code Review
commit 8b0171ba25
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.zuul.yaml
View File

@ -25,6 +25,7 @@
- openstack/mistral - openstack/mistral
- openstack/python-mistralclient - openstack/python-mistralclient
- openstack/mistral-tempest-plugin - openstack/mistral-tempest-plugin
- openstack/mistral-lib
- job: - job:
name: mistral-rally-task name: mistral-rally-task
@ -65,6 +66,9 @@
parent: openstack-tox parent: openstack-tox
vars: vars:
tox_envlist: unit-mysql tox_envlist: unit-mysql
timeout: 3600
required-projects:
- openstack/mistral-lib
- job: - job:
name: mistral-tox-unit-postgresql name: mistral-tox-unit-postgresql
@ -72,12 +76,25 @@
vars: vars:
tox_envlist: unit-postgresql tox_envlist: unit-postgresql
tox_environment: { CI_PROJECT: "{{ zuul['project']['name'] }}" } tox_environment: { CI_PROJECT: "{{ zuul['project']['name'] }}" }
timeout: 3600
required-projects:
- openstack/mistral-lib
- project: - project:
check: check:
jobs: jobs:
- openstack-tox-cover: - openstack-tox-cover:
voting: false 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
- mistral-devstack-non-apache: - mistral-devstack-non-apache:
branches: ^(?!stable/(newton|ocata)).*$ branches: ^(?!stable/(newton|ocata)).*$
@ -96,7 +113,9 @@
- tripleo-ci-centos-7-scenario003-multinode-oooq - tripleo-ci-centos-7-scenario003-multinode-oooq
- tripleo-ci-centos-7-scenario003-multinode-oooq-container - tripleo-ci-centos-7-scenario003-multinode-oooq-container
- mistral-rally-task - mistral-rally-task
- openstack-tox-lower-constraints - openstack-tox-lower-constraints:
required-projects:
- openstack/mistral-lib
gate: gate:
jobs: jobs:
- mistral-devstack - mistral-devstack

7
devstack/plugin.sh
View File

@ -148,6 +148,12 @@ function install_mistral_pythonclient {
fi 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 # start_mistral - Start running processes
function start_mistral { function start_mistral {
@ -237,6 +243,7 @@ if is_service_enabled mistral; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing mistral" echo_summary "Installing mistral"
install_mistral install_mistral
install_mistral_lib
install_mistral_pythonclient install_mistral_pythonclient
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring mistral" echo_summary "Configuring mistral"

4
devstack/settings
View File

@ -23,6 +23,10 @@ MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/pyt
MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-master} MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-master}
MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient 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 # Set up default directories
MISTRAL_DIR=$DEST/mistral MISTRAL_DIR=$DEST/mistral
MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard