diff --git a/jenkins/images.sh b/jenkins/images.sh index 0ca888eb86..00c2dcc2a3 100755 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -14,7 +14,7 @@ gpg --import verify.asc # key imports fail, let's create it here as a workaround mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" -DOWNLOAD_ROOT_SDK="https://storage.googleapis.com${SDK_URL_PATH}" +DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" SCRIPTS_PATCH_ARG="" OVERLAY_PATCH_ARG="" diff --git a/jenkins/packages.sh b/jenkins/packages.sh index b138851285..bf93f665bb 100755 --- a/jenkins/packages.sh +++ b/jenkins/packages.sh @@ -10,7 +10,7 @@ set -ex if [[ "${RELEASE_BASE_IS_DEV}" = "false" && "${GROUP}" = "developer" && "${RELEASE_BASE}" != "" ]]; then DOWNLOAD_ROOT=$(echo ${DOWNLOAD_ROOT} | sed 's,/developer,,'); fi -DOWNLOAD_ROOT_SDK="https://storage.googleapis.com${SDK_URL_PATH}" +DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" # Set up GPG for verifying tags. export GNUPGHOME="${PWD}/.gnupg" diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh index ef1dee1e36..4083339747 100755 --- a/jenkins/sdk.sh +++ b/jenkins/sdk.sh @@ -27,7 +27,7 @@ then fi fi -DOWNLOAD_ROOT_SDK=https://storage.googleapis.com/flatcar-jenkins/sdk +DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" # We do not use a nightly SDK as seed for bootstrapping because the next major Alpha SDK release would also have to use the last published Alpha release SDK as seed. # Also, we don't want compiler bugs to propagate from one nightly SDK to the next even though the commit in question was reverted. diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh index 5293cc7c6d..46090c5a5b 100755 --- a/jenkins/toolchains.sh +++ b/jenkins/toolchains.sh @@ -17,7 +17,7 @@ gpg --import verify.asc # key imports fail, let's create it here as a workaround mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" -DOWNLOAD_ROOT_SDK="https://storage.googleapis.com${SDK_URL_PATH}" +DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" SCRIPTS_PATCH_ARG="" OVERLAY_PATCH_ARG="" diff --git a/jenkins/vms.sh b/jenkins/vms.sh index 6665bbd1c9..82400a749d 100755 --- a/jenkins/vms.sh +++ b/jenkins/vms.sh @@ -14,7 +14,7 @@ gpg --import verify.asc # key imports fail, let's create it here as a workaround mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" -DOWNLOAD_ROOT_SDK="https://storage.googleapis.com${SDK_URL_PATH}" +DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" SCRIPTS_PATCH_ARG="" OVERLAY_PATCH_ARG=""