mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 05:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #170 from flatcar-linux/kai/use-supplied-sdk-path

Browse Source 
jenkins: use the SDK_URL_PATH path for DOWNLOAD_ROOT_SDK
This commit is contained in:
Kai Lüke 2021-10-15 16:06:24 +02:00 committed by GitHub
commit df63e60b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins/images.sh
View File

@ -14,7 +14,8 @@ gpg --import verify.asc
# key imports fail, let's create it here as a workaround # key imports fail, let's create it here as a workaround
mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" 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="" SCRIPTS_PATCH_ARG=""
OVERLAY_PATCH_ARG="" OVERLAY_PATCH_ARG=""

3
jenkins/kola/qemu_common.sh
View File

@ -56,7 +56,8 @@ gpg --import verify.asc
# key imports fail, let's create it here as a workaround # key imports fail, let's create it here as a workaround
mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" 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 if native_arm64 ; then
mkdir -p .repo/ mkdir -p .repo/

3
jenkins/packages.sh
View File

@ -10,7 +10,8 @@ set -ex
if [[ "${RELEASE_BASE_IS_DEV}" = "false" && "${GROUP}" = "developer" && "${RELEASE_BASE}" != "" ]]; then if [[ "${RELEASE_BASE_IS_DEV}" = "false" && "${GROUP}" = "developer" && "${RELEASE_BASE}" != "" ]]; then
DOWNLOAD_ROOT=$(echo ${DOWNLOAD_ROOT} | sed 's,/developer,,'); DOWNLOAD_ROOT=$(echo ${DOWNLOAD_ROOT} | sed 's,/developer,,');
fi 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. # Set up GPG for verifying tags.
export GNUPGHOME="${PWD}/.gnupg" export GNUPGHOME="${PWD}/.gnupg"

3
jenkins/sdk.sh
View File

@ -28,7 +28,8 @@ then
fi fi
DOWNLOAD_ROOT=${DOWNLOAD_ROOT:-"gs://flatcar-jenkins"} 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. # 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. # Also, we don't want compiler bugs to propagate from one nightly SDK to the next even though the commit in question was reverted.

3
jenkins/toolchains.sh
View File

@ -18,7 +18,8 @@ gpg --import verify.asc
mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/"
DOWNLOAD_ROOT=${DOWNLOAD_ROOT:-"${UPLOAD_ROOT}"} 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="" SCRIPTS_PATCH_ARG=""
OVERLAY_PATCH_ARG="" OVERLAY_PATCH_ARG=""

3
jenkins/vms.sh
View File

@ -14,7 +14,8 @@ gpg --import verify.asc
# key imports fail, let's create it here as a workaround # key imports fail, let's create it here as a workaround
mkdir -p --mode=0700 "${GNUPGHOME}/private-keys-v1.d/" 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="" SCRIPTS_PATCH_ARG=""
OVERLAY_PATCH_ARG="" OVERLAY_PATCH_ARG=""