From 96a79a767831a83a4710dad8eed9ba534a91e407 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 11 Jun 2018 13:19:47 -0700 Subject: [PATCH] jenkins/*: switch enter to --bind-gpg-agent=false --experimental is deprecated. --- jenkins/images.sh | 2 +- jenkins/packages.sh | 2 +- jenkins/sdk.sh | 2 +- jenkins/toolchains.sh | 2 +- jenkins/vm.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jenkins/images.sh b/jenkins/images.sh index 3a48624364..fbde85ffc2 100644 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -10,7 +10,7 @@ enter() { sudo ln -f verify.asc chroot/etc/portage/gangue.asc && verify_key=--verify-key=/etc/portage/gangue.asc sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json - bin/cork enter --experimental -- env \ + bin/cork enter --bind-gpg-agent=false -- env \ COREOS_DEV_BUILDS="${DOWNLOAD_ROOT}" \ {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \ --json-key=/etc/portage/gangue.json $verify_key \ diff --git a/jenkins/packages.sh b/jenkins/packages.sh index 70cf3fcd2b..cea5b5aee5 100644 --- a/jenkins/packages.sh +++ b/jenkins/packages.sh @@ -12,7 +12,7 @@ enter() { verify_key=--verify-key=/etc/portage/gangue.asc sudo ln -f "${GOOGLE_APPLICATION_CREDENTIALS}" \ chroot/etc/portage/gangue.json - bin/cork enter --experimental -- env \ + bin/cork enter --bind-gpg-agent=false -- env \ CCACHE_DIR=/mnt/host/source/.cache/ccache \ CCACHE_MAXSIZE=5G \ COREOS_DEV_BUILDS="${DOWNLOAD_ROOT}" \ diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh index bdf5e60918..8437776a4e 100644 --- a/jenkins/sdk.sh +++ b/jenkins/sdk.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex enter() { - bin/cork enter --experimental -- "$@" + bin/cork enter --bind-gpg-agent=false -- "$@" } source .repo/manifests/version.txt diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh index a56ec9e867..e46ecf8c56 100644 --- a/jenkins/toolchains.sh +++ b/jenkins/toolchains.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex enter() { - bin/cork enter --experimental -- "$@" + bin/cork enter --bind-gpg-agent=false -- "$@" } source .repo/manifests/version.txt diff --git a/jenkins/vm.sh b/jenkins/vm.sh index 2e56025783..2f9748dba1 100644 --- a/jenkins/vm.sh +++ b/jenkins/vm.sh @@ -10,7 +10,7 @@ enter() { sudo ln -f verify.asc chroot/etc/portage/gangue.asc && verify_key=--verify-key=/etc/portage/gangue.asc sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json - bin/cork enter --experimental -- env \ + bin/cork enter --bind-gpg-agent=false -- env \ COREOS_DEV_BUILDS="${GS_DEVEL_ROOT}" \ {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \ --json-key=/etc/portage/gangue.json $verify_key \