diff --git a/jenkins/images.sh b/jenkins/images.sh index 767a3d465f..d8d83d77d7 100755 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -53,7 +53,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 f323e7418e..c457d0e56c 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 if [[ $FLATCAR_RELEASE_VERSION =~ master ]] diff --git a/jenkins/packages.sh b/jenkins/packages.sh index bac9d0608d..4f232d9e45 100755 --- a/jenkins/packages.sh +++ b/jenkins/packages.sh @@ -57,7 +57,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 3a1b14a87d..01de33e36a 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 b638349e91..d8ee90e3e9 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}" diff --git a/jenkins/vms.sh b/jenkins/vms.sh index 671ee83068..5ecc4739cf 100755 --- a/jenkins/vms.sh +++ b/jenkins/vms.sh @@ -53,7 +53,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}"' \ "$@"