From 1e6bdd58551246f6ae662a20b733a9c9dd5ef225 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Wed, 11 Sep 2019 21:03:12 -0700
Subject: Update key environment variables.

PiperOrigin-RevId: 268604220
---
 kokoro/build.cfg | 2 +-
 kokoro/go.cfg    | 2 +-
 scripts/build.sh | 2 +-
 scripts/go.sh    | 2 +-
 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
-- 
cgit v1.2.3