From c2c71cac9fe69c25ee3319e8f8116ffc3251265d Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 28 Dec 2022 14:50:57 +0100 Subject: [PATCH] Use curl to download u-c In functional tests we don't ensure that wget exists. Also for Ubuntu we ensure that curl is present only. So let's replace wget command with curl and be consistent across repos. Change-Id: If9106bd0a481079b9e676c5547e244a11a35fb73 --- run_tests_common.sh | 2 +- test-ansible-env-prep.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run_tests_common.sh b/run_tests_common.sh index 2f90e0fe..584daf5e 100755 --- a/run_tests_common.sh +++ b/run_tests_common.sh @@ -50,7 +50,7 @@ case "${ID,,}" in pkg_list="python38 python38-devel redhat-lsb-core" ;; 9) - pkg_list="python3 python3-devel" + pkg_list="python3 python3-devel curl" ;; esac ;; diff --git a/test-ansible-env-prep.sh b/test-ansible-env-prep.sh index 320b3f8b..60a6c45f 100755 --- a/test-ansible-env-prep.sh +++ b/test-ansible-env-prep.sh @@ -181,7 +181,7 @@ REQS_REPO_HOME="${TESTING_HOME}/src/opendev.org/openstack/requirements" if [[ -d "${REQS_REPO_HOME}" ]]; then cp "${REQS_REPO_HOME}/upper-constraints.txt" /tmp/upper-constraints.txt else - wget "${TOX_CONSTRAINTS_FILE:-https://opendev.org/openstack/requirements/raw/${SERVICES_BRANCH}/upper-constraints.txt}" -O /tmp/upper-constraints.txt + curl -L "${TOX_CONSTRAINTS_FILE:-https://opendev.org/openstack/requirements/raw/${SERVICES_BRANCH}/upper-constraints.txt}" -o /tmp/upper-constraints.txt fi # Filter out pip/wheel from OpenStack upper constraints