summaryrefslogtreecommitdiffhomepage
path: root/kokoro
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2018-07-27 17:52:21 -0700
committerShentubot <shentubot@google.com>2018-07-27 17:53:27 -0700
commit3c673659998ecf51a22025886c92cd2d161d85e9 (patch)
tree5eb36f027faf7f01f9f9feb9c8bb42a8b8a90309 /kokoro
parent2793f7ac5f96b474decfff68cfde86bb5c2ed0a4 (diff)
Simplify Kokoro configuration.
PiperOrigin-RevId: 206401009 Change-Id: I26644d1fe637b5a40db013fedf9fc063cc87ce6a
Diffstat (limited to 'kokoro')
-rw-r--r--kokoro/continuous.cfg (renamed from kokoro/gcp_ubuntu/continuous.cfg)2
-rw-r--r--kokoro/presubmit.cfg (renamed from kokoro/gcp_ubuntu/presubmit.cfg)2
-rw-r--r--kokoro/release-nightly.cfg (renamed from kokoro/gcp_ubuntu/release-nightly.cfg)2
-rwxr-xr-xkokoro/run_build.sh (renamed from kokoro/gcp_ubuntu/run_build.sh)0
-rwxr-xr-xkokoro/run_tests.sh (renamed from kokoro/gcp_ubuntu/run_tests.sh)0
5 files changed, 3 insertions, 3 deletions
diff --git a/kokoro/gcp_ubuntu/continuous.cfg b/kokoro/continuous.cfg
index e6552753c..a834db198 100644
--- a/kokoro/gcp_ubuntu/continuous.cfg
+++ b/kokoro/continuous.cfg
@@ -1,7 +1,7 @@
# Location of bash script that runs the test. The first directory in the path
# is the directory where Kokoro will check out the repo. The rest is the path
# is the path to the test script.
-build_file: "repo/kokoro/gcp_ubuntu/run_tests.sh"
+build_file: "repo/kokoro/run_tests.sh"
action {
define_artifacts {
diff --git a/kokoro/gcp_ubuntu/presubmit.cfg b/kokoro/presubmit.cfg
index e6552753c..a834db198 100644
--- a/kokoro/gcp_ubuntu/presubmit.cfg
+++ b/kokoro/presubmit.cfg
@@ -1,7 +1,7 @@
# Location of bash script that runs the test. The first directory in the path
# is the directory where Kokoro will check out the repo. The rest is the path
# is the path to the test script.
-build_file: "repo/kokoro/gcp_ubuntu/run_tests.sh"
+build_file: "repo/kokoro/run_tests.sh"
action {
define_artifacts {
diff --git a/kokoro/gcp_ubuntu/release-nightly.cfg b/kokoro/release-nightly.cfg
index cae10cb83..e5087b1cd 100644
--- a/kokoro/gcp_ubuntu/release-nightly.cfg
+++ b/kokoro/release-nightly.cfg
@@ -1,5 +1,5 @@
# Location of bash script that builds a release.
-build_file: "repo/kokoro/gcp_ubuntu/run_build.sh"
+build_file: "repo/kokoro/run_build.sh"
action {
# Upload runsc binary and its checksum. It may be in multiple paths, so we
diff --git a/kokoro/gcp_ubuntu/run_build.sh b/kokoro/run_build.sh
index f2b719f52..f2b719f52 100755
--- a/kokoro/gcp_ubuntu/run_build.sh
+++ b/kokoro/run_build.sh
diff --git a/kokoro/gcp_ubuntu/run_tests.sh b/kokoro/run_tests.sh
index 0069aa0c4..0069aa0c4 100755
--- a/kokoro/gcp_ubuntu/run_tests.sh
+++ b/kokoro/run_tests.sh