From 7ef55eb15d9f019d17f896d76ed35a3e696f5911 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 8 Oct 2021 11:01:59 +0200 Subject: [PATCH] kola/dev-container: override binhost to use private GCS in this commit we make sure to use GCS bucket for dev container tests by providing the required credentials and the associated fetch command. Signed-off-by: Mathieu Tortuyaux --- jenkins/kola/dev-container.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jenkins/kola/dev-container.sh b/jenkins/kola/dev-container.sh index 3b40d4c46b..4a99d4b1a0 100755 --- a/jenkins/kola/dev-container.sh +++ b/jenkins/kola/dev-container.sh @@ -28,11 +28,15 @@ fi sudo systemd-nspawn $PIPEARG \ --bind-ro=/lib/modules \ --bind-ro="$PWD/flatcar_production_image_kernel_config.txt:/boot/config" \ + --bind-ro="${GOOGLE_APPLICATION_CREDENTIALS}:/opt/credentials.json" \ + --bind-ro="${verify_key}:/opt/verify.asc" \ --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}\"" emerge-gitclone . /usr/share/coreos/release if [[ $FLATCAR_RELEASE_VERSION =~ master ]]