summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2019-09-11 21:03:12 -0700
committergVisor bot <gvisor-bot@google.com>2019-09-11 21:04:42 -0700
commit1e6bdd58551246f6ae662a20b733a9c9dd5ef225 (patch)
tree6df9eace3cbb8fb23af98b8538b1e855b9e18324
parentc06ef5131f1ccd3106ccf4fa4e787db079db2d96 (diff)
Update key environment variables.
PiperOrigin-RevId: 268604220
-rw-r--r--kokoro/build.cfg2
-rw-r--r--kokoro/go.cfg2
-rwxr-xr-xscripts/build.sh2
-rwxr-xr-xscripts/go.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/kokoro/build.cfg b/kokoro/build.cfg
index d67af4694..d462d839c 100644
--- a/kokoro/build.cfg
+++ b/kokoro/build.cfg
@@ -11,7 +11,7 @@ before_action {
env_vars {
key: "KOKORO_REPO_KEY"
- value: "$KOKORO_ROOT/src/keystore/73898_kokoro-repo-key"
+ value: "73898_kokoro-repo-key"
}
action {
diff --git a/kokoro/go.cfg b/kokoro/go.cfg
index 759e16152..b9c1fcb12 100644
--- a/kokoro/go.cfg
+++ b/kokoro/go.cfg
@@ -11,7 +11,7 @@ before_action {
env_vars {
key: "KOKORO_GITHUB_ACCESS_TOKEN"
- value: "$KOKORO_ROOT/src/keystore/73898_kokoro-github-access-token"
+ value: "73898_kokoro-github-access-token"
}
env_vars {
diff --git a/scripts/build.sh b/scripts/build.sh
index d5dd14acc..81023aab3 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,7 +24,7 @@ pkg=$(build -c opt --host_force_python=py2 //runsc:runsc-debian)
# Build a repository, if the key is available.
if [[ -v KOKORO_REPO_KEY ]]; then
- repo=$(tools/make_repository.sh "${KOKORO_REPO_KEY}" gvisor-bot@google.com ${pkg})
+ repo=$(tools/make_repository.sh "${KOKORO_KEYSTORE_DIR}/${KOKORO_REPO_KEY}" gvisor-bot@google.com ${pkg})
fi
# Install installs artifacts.
diff --git a/scripts/go.sh b/scripts/go.sh
index 83a667640..f24fad04c 100755
--- a/scripts/go.sh
+++ b/scripts/go.sh
@@ -35,7 +35,7 @@ if [[ "${KOKORO_GO_PUSH}" == "true" ]]; then
git credential approve <<EOF
protocol=https
host=github.com
-username=$(cat "${KOKORO_GITHUB_ACCESS_TOKEN}")
+username=$(cat "${KOKORO_KEYSTORE_DIR}/${KOKORO_GITHUB_ACCESS_TOKEN}")
password=x-oauth-basic
EOF
fi