mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 05:56:58 +02:00
Merge pull request #170 from flatcar-linux/kai/use-supplied-sdk-path
jenkins: use the SDK_URL_PATH path for DOWNLOAD_ROOT_SDK
This commit is contained in:
commit
df63e60b94
@ -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=""
|
||||
|
@ -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/
|
||||
|
@ -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"
|
||||
|
@ -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.
|
||||
|
@ -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=""
|
||||
|
@ -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=""
|
||||
|
Loading…
Reference in New Issue
Block a user