From 8dae8a10f01b49d9b28c1ae72b67cb5b83238963 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Tue, 18 Feb 2020 17:03:59 -0800 Subject: Internal change. PiperOrigin-RevId: 295857142 --- kokoro/benchmarks/benchmarks.cfg | 26 ++++++++++++++++++++++++++ kokoro/benchmarks/benchmarks.sh | 25 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 kokoro/benchmarks/benchmarks.cfg create mode 100644 kokoro/benchmarks/benchmarks.sh (limited to 'kokoro') diff --git a/kokoro/benchmarks/benchmarks.cfg b/kokoro/benchmarks/benchmarks.cfg new file mode 100644 index 000000000..9b9073e62 --- /dev/null +++ b/kokoro/benchmarks/benchmarks.cfg @@ -0,0 +1,26 @@ +build_file : 'github/github/kokoro/benchmarks/benchmarks.sh' + + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id : 73898 + keyname : 'kokoro-rbe-service-account' + }, + } +} + +env_vars { + key : 'PROJECT' + value : 'gvisor-kokoro-testing' +} + +env_vars { + key : 'ZONE' + value : 'us-central1-b' +} + +env_vars { + key : 'KOKORO_SERVICE_ACCOUNT' + value : '73898_kokoro-rbe-service-account' +} diff --git a/kokoro/benchmarks/benchmarks.sh b/kokoro/benchmarks/benchmarks.sh new file mode 100644 index 000000000..a0317db02 --- /dev/null +++ b/kokoro/benchmarks/benchmarks.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2020 The gVisor Authors. +# +# 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 +# +# http://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. + +# Run in the root of the repo. +cd "$(dirname "$0")" + +KEY_PATH=${KEY_PATH:-"${KOKORO_KEYSTORE_DIR}/${KOKORO_SERVICE_ACCOUNT}"} + +gcloud auth activate-service-account --key-file "${KEY_PATH}" + +gcloud compute instances list + -- cgit v1.2.3 From 90d0851c0e37146158e4f46f6aa1707d786fb48a Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Wed, 19 Feb 2020 11:35:16 -0800 Subject: Internal change. PiperOrigin-RevId: 296016675 --- kokoro/benchmark.sh | 25 +++++++++++++++++++++++++ kokoro/benchmark_tests.cfg | 26 ++++++++++++++++++++++++++ kokoro/benchmarks/benchmarks.cfg | 26 -------------------------- kokoro/benchmarks/benchmarks.sh | 25 ------------------------- 4 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 kokoro/benchmark.sh create mode 100644 kokoro/benchmark_tests.cfg delete mode 100644 kokoro/benchmarks/benchmarks.cfg delete mode 100644 kokoro/benchmarks/benchmarks.sh (limited to 'kokoro') diff --git a/kokoro/benchmark.sh b/kokoro/benchmark.sh new file mode 100644 index 000000000..a0317db02 --- /dev/null +++ b/kokoro/benchmark.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2020 The gVisor Authors. +# +# 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 +# +# http://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. + +# Run in the root of the repo. +cd "$(dirname "$0")" + +KEY_PATH=${KEY_PATH:-"${KOKORO_KEYSTORE_DIR}/${KOKORO_SERVICE_ACCOUNT}"} + +gcloud auth activate-service-account --key-file "${KEY_PATH}" + +gcloud compute instances list + diff --git a/kokoro/benchmark_tests.cfg b/kokoro/benchmark_tests.cfg new file mode 100644 index 000000000..76ba30752 --- /dev/null +++ b/kokoro/benchmark_tests.cfg @@ -0,0 +1,26 @@ +build_file : 'github/github/kokoro/benchmarks.sh' + + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id : 73898 + keyname : 'kokoro-rbe-service-account' + }, + } +} + +env_vars { + key : 'PROJECT' + value : 'gvisor-kokoro-testing' +} + +env_vars { + key : 'ZONE' + value : 'us-central1-b' +} + +env_vars { + key : 'KOKORO_SERVICE_ACCOUNT' + value : '73898_kokoro-rbe-service-account' +} diff --git a/kokoro/benchmarks/benchmarks.cfg b/kokoro/benchmarks/benchmarks.cfg deleted file mode 100644 index 9b9073e62..000000000 --- a/kokoro/benchmarks/benchmarks.cfg +++ /dev/null @@ -1,26 +0,0 @@ -build_file : 'github/github/kokoro/benchmarks/benchmarks.sh' - - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id : 73898 - keyname : 'kokoro-rbe-service-account' - }, - } -} - -env_vars { - key : 'PROJECT' - value : 'gvisor-kokoro-testing' -} - -env_vars { - key : 'ZONE' - value : 'us-central1-b' -} - -env_vars { - key : 'KOKORO_SERVICE_ACCOUNT' - value : '73898_kokoro-rbe-service-account' -} diff --git a/kokoro/benchmarks/benchmarks.sh b/kokoro/benchmarks/benchmarks.sh deleted file mode 100644 index a0317db02..000000000 --- a/kokoro/benchmarks/benchmarks.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright 2020 The gVisor Authors. -# -# 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 -# -# http://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. - -# Run in the root of the repo. -cd "$(dirname "$0")" - -KEY_PATH=${KEY_PATH:-"${KOKORO_KEYSTORE_DIR}/${KOKORO_SERVICE_ACCOUNT}"} - -gcloud auth activate-service-account --key-file "${KEY_PATH}" - -gcloud compute instances list - -- cgit v1.2.3 From ddc02e489cfe3990f76882463c0ad386710a9a94 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Wed, 19 Feb 2020 13:11:38 -0800 Subject: Internal change. PiperOrigin-RevId: 296039442 --- kokoro/benchmark_tests.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kokoro') diff --git a/kokoro/benchmark_tests.cfg b/kokoro/benchmark_tests.cfg index 76ba30752..6a5d9b114 100644 --- a/kokoro/benchmark_tests.cfg +++ b/kokoro/benchmark_tests.cfg @@ -1,4 +1,4 @@ -build_file : 'github/github/kokoro/benchmarks.sh' +build_file : 'repo/kokoro/benchmarks.sh' before_action { -- cgit v1.2.3 From 3a20eccf8b2d30eeff60f616a3e1d0d15c6ffac4 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Wed, 19 Feb 2020 14:17:12 -0800 Subject: Internal change. PiperOrigin-RevId: 296055452 --- kokoro/benchmark.sh | 25 ------------------------- kokoro/benchmark_tests.cfg | 2 +- scripts/benchmark.sh | 25 +++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 kokoro/benchmark.sh create mode 100644 scripts/benchmark.sh (limited to 'kokoro') diff --git a/kokoro/benchmark.sh b/kokoro/benchmark.sh deleted file mode 100644 index a0317db02..000000000 --- a/kokoro/benchmark.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright 2020 The gVisor Authors. -# -# 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 -# -# http://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. - -# Run in the root of the repo. -cd "$(dirname "$0")" - -KEY_PATH=${KEY_PATH:-"${KOKORO_KEYSTORE_DIR}/${KOKORO_SERVICE_ACCOUNT}"} - -gcloud auth activate-service-account --key-file "${KEY_PATH}" - -gcloud compute instances list - diff --git a/kokoro/benchmark_tests.cfg b/kokoro/benchmark_tests.cfg index 6a5d9b114..c48518a05 100644 --- a/kokoro/benchmark_tests.cfg +++ b/kokoro/benchmark_tests.cfg @@ -1,4 +1,4 @@ -build_file : 'repo/kokoro/benchmarks.sh' +build_file : 'repo/scripts/benchmark.sh' before_action { diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh new file mode 100644 index 000000000..a0317db02 --- /dev/null +++ b/scripts/benchmark.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2020 The gVisor Authors. +# +# 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 +# +# http://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. + +# Run in the root of the repo. +cd "$(dirname "$0")" + +KEY_PATH=${KEY_PATH:-"${KOKORO_KEYSTORE_DIR}/${KOKORO_SERVICE_ACCOUNT}"} + +gcloud auth activate-service-account --key-file "${KEY_PATH}" + +gcloud compute instances list + -- cgit v1.2.3 From ededa90d07e4df3eb3fe8a52a0afbcdaf82e8df5 Mon Sep 17 00:00:00 2001 From: Brad Burlage Date: Mon, 24 Feb 2020 14:21:18 -0800 Subject: Internal change. PiperOrigin-RevId: 296972565 --- kokoro/runtime_tests/go1.12.cfg | 10 ++++++++++ kokoro/runtime_tests/java11.cfg | 10 ++++++++++ kokoro/runtime_tests/nodejs12.4.0.cfg | 10 ++++++++++ kokoro/runtime_tests/php7.3.6.cfg | 10 ++++++++++ kokoro/runtime_tests/python3.7.3.cfg | 10 ++++++++++ scripts/common_build.sh | 12 ++++++++++-- 6 files changed, 60 insertions(+), 2 deletions(-) (limited to 'kokoro') diff --git a/kokoro/runtime_tests/go1.12.cfg b/kokoro/runtime_tests/go1.12.cfg index 164ddc18f..fd4911e88 100644 --- a/kokoro/runtime_tests/go1.12.cfg +++ b/kokoro/runtime_tests/go1.12.cfg @@ -4,3 +4,13 @@ env_vars { key: "RUNTIME_TEST_NAME" value: "go1.12" } + +action { + define_artifacts { + regex: "**/sponge_log.xml" + regex: "**/sponge_log.log" + regex: "**/outputs.zip" + regex: "**/runsc" + regex: "**/runsc.*" + } +} \ No newline at end of file diff --git a/kokoro/runtime_tests/java11.cfg b/kokoro/runtime_tests/java11.cfg index 4957d4794..7f8611a08 100644 --- a/kokoro/runtime_tests/java11.cfg +++ b/kokoro/runtime_tests/java11.cfg @@ -4,3 +4,13 @@ env_vars { key: "RUNTIME_TEST_NAME" value: "java11" } + +action { + define_artifacts { + regex: "**/sponge_log.xml" + regex: "**/sponge_log.log" + regex: "**/outputs.zip" + regex: "**/runsc" + regex: "**/runsc.*" + } +} \ No newline at end of file diff --git a/kokoro/runtime_tests/nodejs12.4.0.cfg b/kokoro/runtime_tests/nodejs12.4.0.cfg index 1df343f95..c67ad5567 100644 --- a/kokoro/runtime_tests/nodejs12.4.0.cfg +++ b/kokoro/runtime_tests/nodejs12.4.0.cfg @@ -4,3 +4,13 @@ env_vars { key: "RUNTIME_TEST_NAME" value: "nodejs12.4.0" } + +action { + define_artifacts { + regex: "**/sponge_log.xml" + regex: "**/sponge_log.log" + regex: "**/outputs.zip" + regex: "**/runsc" + regex: "**/runsc.*" + } +} \ No newline at end of file diff --git a/kokoro/runtime_tests/php7.3.6.cfg b/kokoro/runtime_tests/php7.3.6.cfg index 8e3667125..f266c5e26 100644 --- a/kokoro/runtime_tests/php7.3.6.cfg +++ b/kokoro/runtime_tests/php7.3.6.cfg @@ -4,3 +4,13 @@ env_vars { key: "RUNTIME_TEST_NAME" value: "php7.3.6" } + +action { + define_artifacts { + regex: "**/sponge_log.xml" + regex: "**/sponge_log.log" + regex: "**/outputs.zip" + regex: "**/runsc" + regex: "**/runsc.*" + } +} \ No newline at end of file diff --git a/kokoro/runtime_tests/python3.7.3.cfg b/kokoro/runtime_tests/python3.7.3.cfg index 0ca70d5bb..574add152 100644 --- a/kokoro/runtime_tests/python3.7.3.cfg +++ b/kokoro/runtime_tests/python3.7.3.cfg @@ -4,3 +4,13 @@ env_vars { key: "RUNTIME_TEST_NAME" value: "python3.7.3" } + +action { + define_artifacts { + regex: "**/sponge_log.xml" + regex: "**/sponge_log.log" + regex: "**/outputs.zip" + regex: "**/runsc" + regex: "**/runsc.*" + } +} \ No newline at end of file diff --git a/scripts/common_build.sh b/scripts/common_build.sh index ae8b67383..3be0bb21c 100755 --- a/scripts/common_build.sh +++ b/scripts/common_build.sh @@ -70,7 +70,9 @@ function collect_logs() { for d in `find -L "bazel-testlogs" -name 'shard_*_of_*' | xargs dirname | sort | uniq`; do junitparser merge `find $d -name test.xml` $d/test.xml cat $d/shard_*_of_*/test.log > $d/test.log - ls -l $d/shard_*_of_*/test.outputs/outputs.zip && zip -r -1 $d/outputs.zip $d/shard_*_of_*/test.outputs/outputs.zip + if ls -l $d/shard_*_of_*/test.outputs/outputs.zip 2>/dev/null; then + zip -r -1 "$d/outputs.zip" $d/shard_*_of_*/test.outputs/outputs.zip + fi done find -L "bazel-testlogs" -name 'shard_*_of_*' | xargs rm -rf # Move test logs to Kokoro directory. tar is used to conveniently perform @@ -90,7 +92,13 @@ function collect_logs() { echo " gsutil cp gs://gvisor/logs/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/${archive} /tmp" echo " https://storage.cloud.google.com/gvisor/logs/${KOKORO_BUILD_ARTIFACTS_SUBDIR}/${archive}" fi - tar --create --gzip --file="${KOKORO_ARTIFACTS_DIR}/${archive}" -C "${RUNSC_LOGS_DIR}" . + time tar \ + --verbose \ + --create \ + --gzip \ + --file="${KOKORO_ARTIFACTS_DIR}/${archive}" \ + --directory "${RUNSC_LOGS_DIR}" \ + . fi fi fi -- cgit v1.2.3