Skip to content

Commit bcfa3e7

Browse files
author
Ace Nassri
authored
Fix Node Kokoro tests (#768)
* Small change to trigger Kokoro * Move configs a directory down + remove type entry * Use user images * Flatten build files * Remove cloud tasks configs * Add missing config to node6/node8 * Update datastore deps * Update pub/sub deps
1 parent fa440e6 commit bcfa3e7

File tree

122 files changed

+1029
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1029
-499
lines changed

.kokoro/appengine/analytics.cfg

-13
This file was deleted.

.kokoro/appengine/building-an-app-build.cfg

-13
This file was deleted.

.kokoro/appengine/building-an-app-update.cfg

-13
This file was deleted.

.kokoro/appengine/cloudsql.cfg

-13
This file was deleted.

.kokoro/appengine/cloudsql_postgresql.cfg

-13
This file was deleted.

.kokoro/appengine/datastore.cfg

-13
This file was deleted.

.kokoro/appengine/endpoints.cfg

-13
This file was deleted.

.kokoro/appengine/errorreporting.cfg

-13
This file was deleted.

.kokoro/appengine/grunt.cfg

-13
This file was deleted.

.kokoro/appengine/headless-chrome.cfg

-13
This file was deleted.

.kokoro/appengine/hello-world-flexible.cfg

-13
This file was deleted.

.kokoro/appengine/hello-world-standard.cfg

-13
This file was deleted.

.kokoro/appengine/loopback.cfg

-13
This file was deleted.

.kokoro/appengine/mailjet.cfg

-13
This file was deleted.

.kokoro/appengine/memcached.cfg

-13
This file was deleted.

.kokoro/appengine/metadata-flexible.cfg

-13
This file was deleted.

.kokoro/appengine/metadata-standard.cfg

-13
This file was deleted.

.kokoro/appengine/mongodb.cfg

-13
This file was deleted.
+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/analytics"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/building-an-app/build"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/building-an-app/update"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}

.kokoro/appengine/node10/cloudsql.cfg

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/cloudsql"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/cloudsql_postgresql"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}

.kokoro/appengine/node10/cloudtasks.cfg

-3
This file was deleted.

.kokoro/appengine/node10/common.cfg

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3+
# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
4+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
5+
6+
# Download secrets from Cloud Storage.
7+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/nodejs-docs-samples"
8+
9+
# All builds use the trampoline script to run in docker.
10+
build_file: "nodejs-docs-samples/.kokoro/trampoline.sh"
11+
12+
# Tell the trampoline which build file to use.
13+
env_vars: {
14+
key: "TRAMPOLINE_BUILD_FILE"
15+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
16+
}
17+
318
# Configure the docker image for kokoro-trampoline.
419
env_vars: {
520
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/node:10"
21+
value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
722
}
8-
9-
type: PRESUBMIT_GITHUB
+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/datastore"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}
+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
type: PRESUBMIT_GITHUB
3+
# Set the folder in which the tests are run
4+
env_vars: {
5+
key: "PROJECT"
6+
value: "appengine/endpoints"
7+
}
8+
9+
# Tell the trampoline which build file to use.
10+
env_vars: {
11+
key: "TRAMPOLINE_BUILD_FILE"
12+
value: "github/nodejs-docs-samples/.kokoro/build.sh"
13+
}

0 commit comments

Comments
 (0)