Skip to content

Commit

Permalink
build: bring in latest kokoro cfgs to run System tests on PRs (#413)
Browse files Browse the repository at this point in the history
* Re-generate library using /synth.py

* add missing keys
  • Loading branch information
dpebot authored and jkwlui committed Oct 1, 2018
1 parent 6c32789 commit c962a7e
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ jobs:
environment:
NPM_CONFIG_PREFIX: /home/node/.npm-global
- run: npm test
- run: node_modules/.bin/codecov

node8:
docker:
- image: 'node:8'
Expand Down
2 changes: 1 addition & 1 deletion .circleci/npm-install-retry.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let spawn = require('child_process').spawn;
//USE: ./index.js <ms npm can be idle> <number of attempts> [... NPM ARGS]
//

let timeout = process.argv[2] || 60000;
let timeout = process.argv[2] || process.env.NPM_INSTALL_TIMEOUT || 60000;
let attempts = process.argv[3] || 3;
let args = process.argv.slice(4);
if (args.length === 0) {
Expand Down
3 changes: 3 additions & 0 deletions .kokoro/pre-system-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
# system test key
export GCN_STORAGE_2ND_PROJECT_ID=gcloud-node-whitelist-ci-tests
export GCN_STORAGE_2ND_PROJECT_KEY=${KOKORO_GFILE_DIR}/no-whitelist-key.json

export GOOGLE_CLOUD_KMS_KEY_ASIA="projects/long-door-651/locations/asia/keyRings/test-key-asia/cryptoKeys/test-key-asia"
export GOOGLE_CLOUD_KMS_KEY_US="projects/long-door-651/locations/us/keyRings/test-key-us/cryptoKeys/test-key-us"
7 changes: 7 additions & 0 deletions .kokoro/presubmit/node8/samples-test.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Download resources for system tests (service account key, etc.)
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/nodejs-storage/.kokoro/samples-test.sh"
}
7 changes: 7 additions & 0 deletions .kokoro/presubmit/node8/system-test.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Download resources for system tests (service account key, etc.)
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/nodejs-storage/.kokoro/system-test.sh"
}
7 changes: 7 additions & 0 deletions .kokoro/samples-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ export GCLOUD_PROJECT=long-door-651

cd $(dirname $0)/..

# Run a pre-test hook, if a pre-samples-test.sh is in the project
if [ -f .kokoro/pre-samples-test.sh ]; then
set +x
. .kokoro/pre-samples-test.sh
set -x
fi

npm install

# Install and link samples
Expand Down
2 changes: 2 additions & 0 deletions .kokoro/system-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ cd $(dirname $0)/..

# Run a pre-test hook, if a pre-system-test.sh is in the project
if [ -f .kokoro/pre-system-test.sh ]; then
set +x
. .kokoro/pre-system-test.sh
set -x
fi

npm install
Expand Down
2 changes: 2 additions & 0 deletions .kokoro/test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
cd /d %~dp0
cd ..

call npm install -g npm@5 || goto :error

call npm install || goto :error
call npm run test || goto :error

Expand Down
3 changes: 2 additions & 1 deletion .kokoro/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ cd $(dirname $0)/..

npm install
npm test
node_modules/.bin/codecov

bash $KOKORO_GFILE_DIR/codecov.sh
4 changes: 4 additions & 0 deletions codecov.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
codecov:
ci:
- source.cloud.google.com

0 comments on commit c962a7e

Please sign in to comment.