From 422e70c8ceb6f13f0acae619ee023ef0e30e080d Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Wed, 23 Nov 2022 09:35:06 +0800 Subject: [PATCH] test: Update nightly compose URL to updates URL Since RHEL 9.1 and 8.7 released, the nightly compose URL moved to update URL, like /rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.7.0/ --- tools/define-compose-url.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/define-compose-url.sh b/tools/define-compose-url.sh index d1febe3d7..477eb3e71 100755 --- a/tools/define-compose-url.sh +++ b/tools/define-compose-url.sh @@ -8,10 +8,10 @@ if [[ $ID != rhel ]]; then fi if [[ $ID == rhel && ${VERSION_ID%.*} == 8 ]]; then - COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-"${VERSION_ID}"/COMPOSE_ID) + COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-"${VERSION_ID}".0/COMPOSE_ID) # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well - COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/$COMPOSE_ID}" + COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-8/nightly/updates/RHEL-8/$COMPOSE_ID}" elif [[ $ID == rhel && ${VERSION_ID} == "9.1" ]]; then # RHEL 9.1 currently doesn't have a 'latest' compose; use most recent date-stamped build @@ -20,10 +20,10 @@ elif [[ $ID == rhel && ${VERSION_ID} == "9.1" ]]; then # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/$COMPOSE_ID}" elif [[ $ID == rhel && ${VERSION_ID%.*} == 9 ]]; then - COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-"${VERSION_ID}"/COMPOSE_ID) + COMPOSE_ID=$(curl -L http://download.eng.bos.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-"${VERSION_ID}".0/COMPOSE_ID) # default to a nightly tree but respect values passed from ENV so we can test rel-eng composes as well - COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/RHEL-9/$COMPOSE_ID}" + COMPOSE_URL="${COMPOSE_URL:-http://download.eng.bos.redhat.com/rhel-9/nightly/updates/RHEL-9/$COMPOSE_ID}" fi # in case COMPOSE_URL was defined from the outside refresh COMPOSE_ID file,