9 files changed, 18 insertions, 87 deletions
diff --git a/kokoro/build.cfg b/kokoro/build.cfg
index d67af4694..084347dde 100644
--- a/kokoro/build.cfg
+++ b/kokoro/build.cfg
@@ -11,13 +11,12 @@ before_action {
 
 env_vars {
   key: "KOKORO_REPO_KEY"
-  value: "$KOKORO_ROOT/src/keystore/73898_kokoro-repo-key"
+  value: "73898_kokoro-repo-key"
 }
 
 action {
   define_artifacts {
-    regex: "**/runsc"
-    regex: "**/runsc.sha256"
-    regex: "**/repo/**"
+    regex: "**/runsc.*"
+    regex: "**/dists/**"
   }
 }
diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg
deleted file mode 100644
index 88694220a..000000000
--- a/kokoro/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is a temporary file. It will be removed when new Kokoro jobs exist for
-# all the other presubmits.
-build_file: "repo/scripts/build.sh"
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-    regex: "**/sponge_log.log"
-    regex: "**/outputs.zip"
-  }
-}
diff --git a/kokoro/go.cfg b/kokoro/go.cfg
index d1577252a..b9c1fcb12 100644
--- a/kokoro/go.cfg
+++ b/kokoro/go.cfg
@@ -1,5 +1,19 @@
 build_file: "repo/scripts/go.sh"
 
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73898
+      keyname: "kokoro-github-access-token"
+    }
+  }
+}
+
+env_vars {
+  key: "KOKORO_GITHUB_ACCESS_TOKEN"
+  value: "73898_kokoro-github-access-token"
+}
+
 env_vars {
   key: "KOKORO_GO_PUSH"
   value: "true"
diff --git a/kokoro/go_test.cfg b/kokoro/go_tests.cfg
index 5eb51041a..5eb51041a 100644
--- a/kokoro/go_test.cfg
+++ b/kokoro/go_tests.cfg
diff --git a/kokoro/presubmit.cfg b/kokoro/presubmit.cfg
deleted file mode 100644
index eb0c78ea4..000000000
--- a/kokoro/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is a temporary file. It will be removed when new Kokoro jobs exist for
-# all the other presubmits.
-build_file: "repo/kokoro/run_tests.sh"
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-    regex: "**/sponge_log.log"
-    regex: "**/outputs.zip"
-  }
-}
diff --git a/kokoro/release-nightly.cfg b/kokoro/release-nightly.cfg
deleted file mode 100644
index ae134258c..000000000
--- a/kokoro/release-nightly.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is a temporary bridge. It will be removed shortly, when Kokoro jobs
-# are configured to point at the new build and release configurations.
-build_file: "repo/kokoro/run_build.sh"
-
-action {
-  define_artifacts {
-    regex: "**/runsc"
-    regex: "**/runsc.sha512"
-  }
-}
diff --git a/kokoro/run_build.sh b/kokoro/run_build.sh
deleted file mode 100755
index da6a0c85e..000000000
--- a/kokoro/run_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Copyright 2018 The gVisor Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file is a temporary bridge. We will create multiple independent Kokoro
-# workflows that call each of the build scripts independently.
-KOKORO_BUILD_NIGHTLY=true $(dirname $0)/../scripts/build.sh
diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh
deleted file mode 100644
index 5552da11c..000000000
--- a/kokoro/run_tests.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 The gVisor Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -xeo pipefail
-
-# This file is a temporary bridge. We will create multiple independent Kokoro
-# workflows that call each of the test scripts independently.
-
-# Run all the tests in sequence.
-$(dirname $0)/../scripts/do_tests.sh
-$(dirname $0)/../scripts/make_tests.sh
-$(dirname $0)/../scripts/root_tests.sh
-$(dirname $0)/../scripts/docker_tests.sh
-$(dirname $0)/../scripts/overlay_tests.sh
-$(dirname $0)/../scripts/hostnet_tests.sh
-$(dirname $0)/../scripts/simple_tests.sh
diff --git a/kokoro/ubuntu1604/20_bazel.sh b/kokoro/ubuntu1604/20_bazel.sh
index 74b4b8be2..b9a894024 100755
--- a/kokoro/ubuntu1604/20_bazel.sh
+++ b/kokoro/ubuntu1604/20_bazel.sh
@@ -16,9 +16,7 @@
 
 set -xeo pipefail
 
-# We need to install a specific version of bazel due to a bug with the RBE
-# environment not respecting the dockerPrivileged configuration.
-declare -r BAZEL_VERSION=0.28.1
+declare -r BAZEL_VERSION=0.29.1
 
 # Install bazel dependencies.
 apt-get update && apt-get install -y openjdk-8-jdk-headless unzip