diff options
Diffstat (limited to 'integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep')
-rwxr-xr-x | integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep index f563406a..bf71faa7 100755 --- a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep +++ b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep @@ -8,7 +8,7 @@ set -o xtrace source $_LIB/die -BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default} +TROVE_BRANCH=${TROVE_BRANCH:-'master'} REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/../../requirements.txt [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set" @@ -30,13 +30,10 @@ if [ -f "${DEST}/requirements/${UC_FILE}" ]; then of="${TMP_HOOKS_PATH}/${UC_FILE}" else UC_DIR=$(pwd) - UC_BRANCH=${BRANCH_OVERRIDE} - if [ "${UC_BRANCH}" == "default" ]; then - UC_BRANCH=master - fi + UC_BRANCH=${TROVE_BRANCH##stable/} set +e - curl -o "${UC_DIR}/${UC_FILE}" "https://opendev.org/openstack/requirements/raw/branch/${UC_BRANCH}/${UC_FILE}" + curl -L -o "${UC_DIR}/${UC_FILE}" "https://releases.openstack.org/constraints/upper/${UC_BRANCH}" set -e if [ -f "${UC_DIR}/${UC_FILE}" ]; then |