openstack
/
tripleo-ci
Code Issues Proposed changes

Correct branch used in tripleo-upgrade installation. 

STABLE_BRANCH variable omits the 'stable/'
section of the branch name. However, the
tripleo-upgrade role is branched out using
that structure. So when installing the
oooq requirements it will try to download
queens or pike branch, which won't be found.
It should be stable/pike or stable/queens
instead.

Change-Id: I93fe1d3a285a2d9ec40c4245ea012a66e6584a30
This commit is contained in:
Jose Luis Franco Arza 2018-04-20 13:18:19 +02:00
parent 995271ccc8
commit 7ce16351bc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toci_gate_test-oooq.sh
View File

@ -228,9 +228,14 @@ fi
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
if [[ -n "$STABLE_RELEASE" ]]; then
TRIPLEO_UPGRADE_BRANCH="stable/${STABLE_RELEASE}"
else
TRIPLEO_UPGRADE_BRANCH="master"
fi
# Otherwise, if not importing it, oooq will fail when loading
# tripleo-upgrade role in the playbook.
echo "git+https://git.openstack.org/openstack/tripleo-upgrade.git@${STABLE_RELEASE}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
echo "git+https://git.openstack.org/openstack/tripleo-upgrade.git@${TRIPLEO_UPGRADE_BRANCH}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
fi
# Start time tracking