Skip to content

Commit

Permalink
build: samples test by adding approprate test variables (#423)
Browse files Browse the repository at this point in the history
* share environment variabes between system and samples test

* remove legacy kokoro build configs

* fix script
  • Loading branch information
jkwlui authored and frankyn committed Oct 3, 2018
1 parent ad38010 commit 71375da
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 114 deletions.
17 changes: 17 additions & 0 deletions .kokoro/pre-samples-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

. .kokoro/setup-vars.sh
8 changes: 1 addition & 7 deletions .kokoro/pre-system-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# nodejs-storage's system tests require additional project and
# 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"
. .kokoro/setup-vars.sh
10 changes: 0 additions & 10 deletions .kokoro/sample_tests.cfg

This file was deleted.

44 changes: 0 additions & 44 deletions .kokoro/sample_tests.sh

This file was deleted.

23 changes: 23 additions & 0 deletions .kokoro/setup-vars.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash

# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# nodejs-storage's system tests require additional project and
# 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"
10 changes: 0 additions & 10 deletions .kokoro/system_tests.cfg

This file was deleted.

43 changes: 0 additions & 43 deletions .kokoro/system_tests.sh

This file was deleted.

0 comments on commit 71375da

Please sign in to comment.