From 7c476bf4cdac5a6988cd0bd6ac1473a00377a8ab Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Mon, 2 Apr 2018 16:02:37 +0200 Subject: [PATCH] Import gated tripleo-upgrade role. To leveraget that tripleo-upgrade is now being gated, let's import it into oooq requirements from the location where zuul is downloading it. Change-Id: Icc84645a16aa53ca2cb974dbeb52e6474cd98aab Closes-Bug: #1749740 --- toci_gate_test-oooq.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh index e3d55f607..614040252 100755 --- a/toci_gate_test-oooq.sh +++ b/toci_gate_test-oooq.sh @@ -221,6 +221,15 @@ if [[ ! -z $NODES_FILE ]]; then done fi +# Import gated tripleo-upgrade in oooq for upgrades/updates jobs +if [[ -d $TRIPLEO_ROOT/tripleo-upgrade ]]; then + echo "file://${TRIPLEO_ROOT}/tripleo-upgrade/#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt +else + # Otherwise, if not importing it, oooq will fail when loading + # tripleo-upgrade role in the playbook. + echo "git+https://git.openstack.org/tripleo-upgrade.git@${STABLE_RELEASE}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt +fi + # Start time tracking export STATS_TESTENV=$(date +%s) pushd $TRIPLEO_ROOT/tripleo-ci