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 | 27 |
1 files changed, 6 insertions, 21 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 bf71faa7..5a0c1ecd 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 @@ -17,27 +17,12 @@ REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/../../requirements.txt sudo -Hiu ${HOST_USERNAME} dd if=${REQUIREMENTS_FILE} of=${TMP_HOOKS_PATH}/requirements.txt -# Grab the upper constraints file, but don't fail if we can't find it. -# If we are running in the CI environment, $DEST will be set and stackrc -# will use $DEST/requirements as the location for the requirements repo. -# Use that as it will help us chain a job with something that is changing UC. - UC_FILE=upper-constraints.txt +UC_DIR=$(pwd) +UC_BRANCH=${TROVE_BRANCH##stable/} -if [ -f "${DEST}/requirements/${UC_FILE}" ]; then - echo "Found ${DEST}/requirements/${UC_FILE}, using that" - sudo -Hiu ${HOST_USERNAME} dd if="${DEST}/requirements/${UC_FILE}" \ - of="${TMP_HOOKS_PATH}/${UC_FILE}" -else - UC_DIR=$(pwd) - UC_BRANCH=${TROVE_BRANCH##stable/} - - set +e - curl -L -o "${UC_DIR}/${UC_FILE}" "https://releases.openstack.org/constraints/upper/${UC_BRANCH}" - set -e - - if [ -f "${UC_DIR}/${UC_FILE}" ]; then - sudo -Hiu ${HOST_USERNAME} dd if="${UC_DIR}/${UC_FILE}" of=${TMP_HOOKS_PATH}/${UC_FILE} - rm -f "${UC_DIR}/${UC_FILE}" - fi +curl -L -o "${UC_DIR}/${UC_FILE}" "https://releases.openstack.org/constraints/upper/${UC_BRANCH}" +if [ -f "${UC_DIR}/${UC_FILE}" ]; then + sudo -Hiu ${HOST_USERNAME} dd if="${UC_DIR}/${UC_FILE}" of=${TMP_HOOKS_PATH}/${UC_FILE} + rm -f "${UC_DIR}/${UC_FILE}" fi |