From 3c673659998ecf51a22025886c92cd2d161d85e9 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Fri, 27 Jul 2018 17:52:21 -0700
Subject: [PATCH] Simplify Kokoro configuration.

PiperOrigin-RevId: 206401009
Change-Id: I26644d1fe637b5a40db013fedf9fc063cc87ce6a
---
 kokoro/{gcp_ubuntu => }/continuous.cfg      | 2 +-
 kokoro/{gcp_ubuntu => }/presubmit.cfg       | 2 +-
 kokoro/{gcp_ubuntu => }/release-nightly.cfg | 2 +-
 kokoro/{gcp_ubuntu => }/run_build.sh        | 0
 kokoro/{gcp_ubuntu => }/run_tests.sh        | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename kokoro/{gcp_ubuntu => }/continuous.cfg (85%)
 rename kokoro/{gcp_ubuntu => }/presubmit.cfg (85%)
 rename kokoro/{gcp_ubuntu => }/release-nightly.cfg (82%)
 rename kokoro/{gcp_ubuntu => }/run_build.sh (100%)
 rename kokoro/{gcp_ubuntu => }/run_tests.sh (100%)

diff --git a/kokoro/gcp_ubuntu/continuous.cfg b/kokoro/continuous.cfg
similarity index 85%
rename from kokoro/gcp_ubuntu/continuous.cfg
rename to 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
similarity index 85%
rename from kokoro/gcp_ubuntu/presubmit.cfg
rename to 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
similarity index 82%
rename from kokoro/gcp_ubuntu/release-nightly.cfg
rename to 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
similarity index 100%
rename from kokoro/gcp_ubuntu/run_build.sh
rename to kokoro/run_build.sh
diff --git a/kokoro/gcp_ubuntu/run_tests.sh b/kokoro/run_tests.sh
similarity index 100%
rename from kokoro/gcp_ubuntu/run_tests.sh
rename to kokoro/run_tests.sh