jenkins: add --json-key to cork update commands

it pulls flatcar/mantle#239 to be able to use `--json-key` in order to access private GCS bucket Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
flatcar · Oct 7, 2021 · 998d2f4 · 998d2f4
1 parent 7f80cb1
commit 998d2f4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/jenkins/images.sh b/jenkins/images.sh
@@ -32,10 +32,12 @@ fi
 bin/cork update \
     --create --downgrade-replace --verify --verify-signature --verbose \
     --sdk-url-path "${SDK_URL_PATH}" \
+    --json-key "${GS_DEVEL_CREDS}" \
     --force-sync \
     ${SCRIPTS_PATCH_ARG} ${OVERLAY_PATCH_ARG} ${PORTAGE_PATCH_ARG} \
     --manifest-branch "refs/tags/${MANIFEST_TAG}" \
     --manifest-name "${MANIFEST_NAME}" \
+    --sdk-url storage.googleapis.com \
     --manifest-url "${MANIFEST_URL}" -- --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}"
 
 # Clear out old images.

diff --git a/jenkins/kola/qemu_common.sh b/jenkins/kola/qemu_common.sh
@@ -68,6 +68,7 @@ else
       --create --downgrade-replace --verify --verify-signature --verbose \
       --sdk-url-path "${SDK_URL_PATH}" \
       --force-sync \
+      --json-key "${GOOGLE_APPLICATION_CREDENTIALS}" \
       --manifest-branch "refs/tags/${MANIFEST_TAG}" \
       --manifest-name "${MANIFEST_NAME}" \
       --manifest-url "${MANIFEST_URL}" -- --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}"
@@ -100,6 +101,7 @@ rm -f flatcar_test_update.gz
 bin/gangue get \
     --json-key="${GOOGLE_APPLICATION_CREDENTIALS}" \
     --verify=true $verify_key \
+    --sdk-url=storage.googleapis.com \
     "${DOWNLOAD_ROOT}/boards/${BOARD}/${FLATCAR_VERSION}/flatcar_test_update.gz"
 mv flatcar_test_update.gz tmp/
 

diff --git a/jenkins/packages.sh b/jenkins/packages.sh
@@ -39,10 +39,12 @@ bin/cork update \
     --create --downgrade-replace --verify --verify-signature --verbose \
     --sdk-url-path "${SDK_URL_PATH}" \
     --force-sync \
+    --json-key "${GOOGLE_APPLICATION_CREDENTIALS}" \
     ${SCRIPTS_PATCH_ARG} ${OVERLAY_PATCH_ARG} ${PORTAGE_PATCH_ARG} \
     --manifest-branch "refs/tags/${MANIFEST_TAG}" \
     --manifest-name "${MANIFEST_NAME}" \
     --manifest-url "${MANIFEST_URL}" \
+    --sdk-url=storage.googleapis.com \
     -- --toolchain_boards="${BOARD}" --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}"
 
 enter() {

diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh
@@ -41,7 +41,9 @@ bin/cork update \
     --create --downgrade-replace --verify --verify-signature --verbose \
     --sdk-version "${SEED_SDK_VERSION}" \
     --force-sync \
+    --json-key "${GOOGLE_APPLICATION_CREDENTIALS}" \
     --manifest-branch "refs/tags/${MANIFEST_TAG}" \
+    --sdk-url storage.googleapis.com \
     --manifest-name "${MANIFEST_NAME}" \
     --manifest-url "${MANIFEST_URL}"  -- --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}"
 

diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh
@@ -35,6 +35,8 @@ fi
 bin/cork update \
     --create --downgrade-replace --verify --verify-signature --verbose \
     --sdk-url-path "${SDK_URL_PATH}" \
+    --json-key "${GOOGLE_APPLICATION_CREDENTIALS}" \
+    --sdk-url storage.googleapis.com \
     --force-sync \
     ${SCRIPTS_PATCH_ARG} ${OVERLAY_PATCH_ARG} ${PORTAGE_PATCH_ARG} \
     --manifest-branch "refs/tags/${MANIFEST_TAG}" \

diff --git a/jenkins/vms.sh b/jenkins/vms.sh
@@ -33,6 +33,7 @@ bin/cork update \
     --create --downgrade-replace --verify --verify-signature --verbose \
     --sdk-url-path "${SDK_URL_PATH}" \
     --force-sync \
+    --json-key "${GS_DEVEL_CREDS}" \
     ${SCRIPTS_PATCH_ARG} ${OVERLAY_PATCH_ARG} ${PORTAGE_PATCH_ARG} \
     --manifest-branch "refs/tags/${MANIFEST_TAG}" \
     --manifest-name "${MANIFEST_NAME}" \
@@ -78,6 +79,7 @@ bin/cork download-image \
     --root="${UPLOAD_ROOT}/boards/${BOARD}/${FLATCAR_VERSION}" \
     --json-key="${GOOGLE_APPLICATION_CREDENTIALS}" \
     --cache-dir=./src \
+    --sdk-url=storage.googleapis.com \
     --platform=qemu \
     --verify=true $verify_key