openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Correct branch used in tripleo-upgrade installation."

This commit is contained in:
Zuul 2018-04-24 17:50:58 +00:00 committed by Gerrit Code Review
parent 63147bc8d0 7ce16351bc
commit e556a40055
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