From 2c29875627ef81db9e45b33d9c9138330d6c3070 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Wed, 20 Apr 2022 19:48:58 +0900
Subject: [PATCH] Use gangue compiled from Jenkins

These scripts happened to use the copy of gangue in the SDK which isn't
expected because it should use the binaries complied by Jenkins.
---
 jenkins/images.sh             | 2 +-
 jenkins/kola/dev-container.sh | 3 ++-
 jenkins/packages.sh           | 2 +-
 jenkins/sdk.sh                | 2 +-
 jenkins/toolchains.sh         | 4 ++--
 jenkins/vms.sh                | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jenkins/images.sh b/jenkins/images.sh
index d972b5dbba..4bc5a6baa3 100755
--- a/jenkins/images.sh
+++ b/jenkins/images.sh
@@ -56,7 +56,7 @@ enter() {
         bin/cork enter --bind-gpg-agent=false -- env \
             FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
             FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
-            {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
+            {FETCH,RESUME}COMMAND_GS="/mnt/host/source/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
             "$@"
diff --git a/jenkins/kola/dev-container.sh b/jenkins/kola/dev-container.sh
index ea579a904d..74869c19eb 100755
--- a/jenkins/kola/dev-container.sh
+++ b/jenkins/kola/dev-container.sh
@@ -31,13 +31,14 @@ sudo systemd-nspawn $PIPEARG \
     --bind-ro="$PWD/flatcar_production_image_kernel_config.txt:/boot/config" \
     --bind-ro="${GOOGLE_APPLICATION_CREDENTIALS}:/opt/credentials.json" \
     --bind-ro="$PWD/verify.asc:/opt/verify.asc" \
+    --bind-ro="$PWD/bin/gangue:/opt/bin/gangue" \
     --image=flatcar_developer_container.bin \
     --machine=flatcar-developer-container-$(uuidgen) \
     --tmpfs=/usr/src \
     --tmpfs=/var/tmp \
     /bin/bash -eux << 'EOF'
 export PORTAGE_BINHOST="${PORTAGE_BINHOST}"
-export {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get --json-key=/opt/credentials.json --verify=true /opt/verify.asc \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+export {FETCH,RESUME}COMMAND_GS="/opt/bin/gangue get --json-key=/opt/credentials.json --verify=true /opt/verify.asc \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
 emerge-gitclone
 . /usr/share/coreos/release
 emerge -gv coreos-sources
diff --git a/jenkins/packages.sh b/jenkins/packages.sh
index a175cbf15c..830aafe8a6 100755
--- a/jenkins/packages.sh
+++ b/jenkins/packages.sh
@@ -60,7 +60,7 @@ enter() {
         bin/cork enter --bind-gpg-agent=false -- env \
             FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
             FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
-            {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
+            {FETCH,RESUME}COMMAND_GS="/mnt/host/source/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
             "$@"
diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh
index 1c52fa3581..b7bc5ddf1d 100755
--- a/jenkins/sdk.sh
+++ b/jenkins/sdk.sh
@@ -72,7 +72,7 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
 sudo rm -rf src/build
 
 # Fetch DIGEST to prevent re-downloading the same SDK tarball
-enter gangue get --verify-key /opt/verify.asc --json-key /etc/portage/gangue.json "${DOWNLOAD_ROOT_SDK}/amd64/${FLATCAR_SDK_VERSION}/flatcar-sdk-amd64-${FLATCAR_SDK_VERSION}.tar.bz2.DIGESTS" /mnt/host/source/.cache/sdks/
+enter /mnt/host/source/bin/gangue get --verify-key /opt/verify.asc --json-key /etc/portage/gangue.json "${DOWNLOAD_ROOT_SDK}/amd64/${FLATCAR_SDK_VERSION}/flatcar-sdk-amd64-${FLATCAR_SDK_VERSION}.tar.bz2.DIGESTS" /mnt/host/source/.cache/sdks/
 
 enter sudo \
     FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh
index 59723f874c..2d461d271e 100755
--- a/jenkins/toolchains.sh
+++ b/jenkins/toolchains.sh
@@ -52,7 +52,7 @@ enter() {
   bin/cork enter --bind-gpg-agent=false -- env \
       FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
       FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
-      {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
+      {FETCH,RESUME}COMMAND_GS="/mnt/host/source/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
       "$@"
@@ -66,7 +66,7 @@ source .repo/manifests/version.txt
 export FLATCAR_BUILD_ID
 
 # Fetch DIGEST to prevent re-downloading the same SDK tarball
-enter gangue get --verify-key /opt/verify.asc --json-key /etc/portage/gangue.json "${DOWNLOAD_ROOT_SDK}/amd64/${FLATCAR_SDK_VERSION}/flatcar-sdk-amd64-${FLATCAR_SDK_VERSION}.tar.bz2.DIGESTS" /mnt/host/source/.cache/sdks/
+enter /mnt/host/source/bin/gangue get --verify-key /opt/verify.asc --json-key /etc/portage/gangue.json "${DOWNLOAD_ROOT_SDK}/amd64/${FLATCAR_SDK_VERSION}/flatcar-sdk-amd64-${FLATCAR_SDK_VERSION}.tar.bz2.DIGESTS" /mnt/host/source/.cache/sdks/
 
 script update_chroot \
     --toolchain_boards="${BOARD}" --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}" --setuponly
diff --git a/jenkins/vms.sh b/jenkins/vms.sh
index dc0bc23395..132f9a08f1 100755
--- a/jenkins/vms.sh
+++ b/jenkins/vms.sh
@@ -56,7 +56,7 @@ enter() {
         bin/cork enter --bind-gpg-agent=false -- env \
             FLATCAR_DEV_BUILDS="${GS_DEVEL_ROOT}" \
             FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \
-            {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
+            {FETCH,RESUME}COMMAND_GS="/mnt/host/source/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
             "$@"