diff --git a/jenkins/images.sh b/jenkins/images.sh index 7c90108b88..c2251624ef 100755 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -14,7 +14,8 @@ 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="${DOWNLOAD_ROOT}/sdk" +# since /flatcar-jenkins/developer/sdk starts with a / we only use one +DOWNLOAD_ROOT_SDK="gs:/${SDK_URL_PATH}" SCRIPTS_PATCH_ARG="" OVERLAY_PATCH_ARG="" diff --git a/jenkins/kola/qemu_common.sh b/jenkins/kola/qemu_common.sh index ebe42f95ae..afb7b4730f 100755 --- a/jenkins/kola/qemu_common.sh +++ b/jenkins/kola/qemu_common.sh @@ -56,7 +56,8 @@ 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="${DOWNLOAD_ROOT}/sdk" +# since /flatcar-jenkins/developer/sdk starts with a / we only use one +DOWNLOAD_ROOT_SDK="gs:/${SDK_URL_PATH}" if native_arm64 ; then mkdir -p .repo/ diff --git a/jenkins/packages.sh b/jenkins/packages.sh index 29187cbf81..a175cbf15c 100755 --- a/jenkins/packages.sh +++ b/jenkins/packages.sh @@ -10,7 +10,8 @@ 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="${DOWNLOAD_ROOT}/sdk" +# since /flatcar-jenkins/developer/sdk starts with a / we only use one +DOWNLOAD_ROOT_SDK="gs:/${SDK_URL_PATH}" # Set up GPG for verifying tags. export GNUPGHOME="${PWD}/.gnupg" diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh index 3aa09ef06f..4f0a4880bf 100755 --- a/jenkins/sdk.sh +++ b/jenkins/sdk.sh @@ -28,7 +28,8 @@ then fi DOWNLOAD_ROOT=${DOWNLOAD_ROOT:-"gs://flatcar-jenkins"} -DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" +# The seed SDK is always a release SDK +DOWNLOAD_ROOT_SDK="gs://flatcar-jenkins/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 a3523f6cf3..b638349e91 100755 --- a/jenkins/toolchains.sh +++ b/jenkins/toolchains.sh @@ -18,7 +18,8 @@ gpg --import verify.asc mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" DOWNLOAD_ROOT=${DOWNLOAD_ROOT:-"${UPLOAD_ROOT}"} -DOWNLOAD_ROOT_SDK="${DOWNLOAD_ROOT}/sdk" +# since /flatcar-jenkins/developer/sdk starts with a / we only use one +DOWNLOAD_ROOT_SDK="gs:/${SDK_URL_PATH}" SCRIPTS_PATCH_ARG="" OVERLAY_PATCH_ARG="" diff --git a/jenkins/vms.sh b/jenkins/vms.sh index ce51e989c4..4beb63653e 100755 --- a/jenkins/vms.sh +++ b/jenkins/vms.sh @@ -14,7 +14,8 @@ 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="${DOWNLOAD_ROOT}/sdk" +# since /flatcar-jenkins/developer/sdk starts with a / we only use one +DOWNLOAD_ROOT_SDK="gs:/${SDK_URL_PATH}" SCRIPTS_PATCH_ARG="" OVERLAY_PATCH_ARG=""