chore: move kokoro configs to new locations (#37)

nolanmar511 · kalyanac · commit 7c21ca45f6ca · 2019-04-01T13:12:11.000-07:00
diff --git a/tools/kokoro/unit-test/common.cfg b/tools/kokoro/unit-test/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -20,5 +20,5 @@ env_vars: {
 }
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/continuous-lint.cfg b/tools/kokoro/unit-test/continuous-lint.cfg
@@ -0,0 +1,4 @@
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/lint.sh"
+}
diff --git a/tools/kokoro/unit-test/continuous-linux-node10.cfg b/tools/kokoro/unit-test/continuous-linux-node10.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/continuous-linux-node11.cfg b/tools/kokoro/unit-test/continuous-linux-node11.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:11-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/continuous-linux-node6.cfg b/tools/kokoro/unit-test/continuous-linux-node6.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/continuous-linux-node8.cfg b/tools/kokoro/unit-test/continuous-linux-node8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/continuous-windows.cfg b/tools/kokoro/unit-test/continuous-windows.cfg
@@ -0,0 +1,2 @@
+# Use the test file directly
+build_file: "pprof-nodejs/tools/test.bat"
diff --git a/tools/kokoro/unit-test/continuous/linux/node10/common.cfg b/tools/kokoro/unit-test/continuous/linux/node10/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/continuous/linux/node11/common.cfg b/tools/kokoro/unit-test/continuous/linux/node11/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/continuous/linux/node6/common.cfg b/tools/kokoro/unit-test/continuous/linux/node6/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/continuous/linux/node8/common.cfg b/tools/kokoro/unit-test/continuous/linux/node8/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/continuous/linux/node8/lint.cfg b/tools/kokoro/unit-test/continuous/linux/node8/lint.cfg
@@ -1,4 +1,4 @@
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/lint.sh"
+    value: "github/pprof-nodejs/tools/lint.sh"
 }
diff --git a/tools/kokoro/unit-test/presubmit-lint.cfg b/tools/kokoro/unit-test/presubmit-lint.cfg
@@ -0,0 +1,4 @@
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/lint.sh"
+}
diff --git a/tools/kokoro/unit-test/presubmit-linux-node10.cfg b/tools/kokoro/unit-test/presubmit-linux-node10.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/presubmit-linux-node11.cfg b/tools/kokoro/unit-test/presubmit-linux-node11.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:11-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/presubmit-linux-node6.cfg b/tools/kokoro/unit-test/presubmit-linux-node6.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/presubmit-linux-node8.cfg b/tools/kokoro/unit-test/presubmit-linux-node8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user"
+}
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/pprof-nodejs/tools/test.sh"
+}
diff --git a/tools/kokoro/unit-test/presubmit-windows.cfg b/tools/kokoro/unit-test/presubmit-windows.cfg
@@ -0,0 +1,2 @@
+# Use the test file directly
+build_file: "pprof-nodejs/tools/test.bat"
diff --git a/tools/kokoro/unit-test/presubmit/linux/node10/common.cfg b/tools/kokoro/unit-test/presubmit/linux/node10/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/presubmit/linux/node11/common.cfg b/tools/kokoro/unit-test/presubmit/linux/node11/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/presubmit/linux/node6/common.cfg b/tools/kokoro/unit-test/presubmit/linux/node6/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/presubmit/linux/node8/common.cfg b/tools/kokoro/unit-test/presubmit/linux/node8/common.cfg
@@ -11,7 +11,7 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"
+build_file: "pprof-nodejs/tools/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
@@ -21,5 +21,5 @@ env_vars: {
 
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"
+    value: "github/pprof-nodejs/tools/test.sh"
 }
diff --git a/tools/kokoro/unit-test/presubmit/linux/node8/lint.cfg b/tools/kokoro/unit-test/presubmit/linux/node8/lint.cfg
@@ -1,4 +1,4 @@
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/pprof-nodejs/tools/kokoro/unit-test/lint.sh"
+    value: "github/pprof-nodejs/tools/lint.sh"
 }
diff --git a/tools/kokoro/unit-test/presubmit/windows/test.cfg b/tools/kokoro/unit-test/presubmit/windows/test.cfg
@@ -1,2 +1,2 @@
 # Use the test file directly
-build_file: "pprof-nodejs/tools/kokoro/unit-test/test.bat"
+build_file: "pprof-nodejs/tools/test.bat"
diff --git a/tools/lint.sh b/tools/lint.sh
diff --git a/tools/test.bat b/tools/test.bat
@@ -13,6 +13,6 @@
 @rem limitations under the License.
 
 cd /d %~dp0	
-cd ../../../
+cd ../
 
-"C:\Program Files\Git\bin\bash.exe" tools/kokoro/unit-test/test.sh --windows
+"C:\Program Files\Git\bin\bash.exe" tools/test.sh --windows
diff --git a/tools/test.sh b/tools/test.sh
diff --git a/tools/trampoline.sh b/tools/trampoline.sh

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ action {`
`11`	`11`	`gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"`
`12`	`12`
`13`	`13`	`# Use the trampoline script to run in docker.`
`14`		`-build_file: "pprof-nodejs/tools/kokoro/unit-test/trampoline.sh"`
	`14`	`+build_file: "pprof-nodejs/tools/trampoline.sh"`
`15`	`15`
`16`	`16`	`# Configure the docker image for kokoro-trampoline.`
`17`	`17`	`env_vars: {`
`@@ -20,5 +20,5 @@ env_vars: {`
`20`	`20`	`}`
`21`	`21`	`env_vars: {`
`22`	`22`	`key: "TRAMPOLINE_BUILD_FILE"`
`23`		`- value: "github/pprof-nodejs/tools/kokoro/unit-test/test.sh"`
	`23`	`+ value: "github/pprof-nodejs/tools/test.sh"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Use the test file directly`
	`2`	`+build_file: "pprof-nodejs/tools/test.bat"`