From 67a2ab1438cdccbe045143bbfaa807cf83110ebc Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Tue, 3 Sep 2019 22:01:34 -0700 Subject: Impose order on test scripts. The simple test script has gotten out of control. Shard this script into different pieces and attempt to impose order on overall test structure. This change helps lay some of the foundations for future improvements. * The runsc/test directories are moved into just test/. * The runsc/test/testutil package is split into logical pieces. * The scripts/ directory contains new top-level targets. * Each test is now responsible for building targets it requires. * The install functionality is moved into `runsc` itself for simplicity. * The existing kokoro run_tests.sh file now just calls all (can be split). After this change is merged, I will create multiple distinct workflows for Kokoro, one for each of the scripts currently targeted by `run_tests.sh` today, which should dramatically reduce the time-to-run for the Kokoro tests, and provides a better foundation for further improvements to the infrastructure. PiperOrigin-RevId: 267081397 --- kokoro/presubmit.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'kokoro/presubmit.cfg') diff --git a/kokoro/presubmit.cfg b/kokoro/presubmit.cfg index 8da47736a..eb0c78ea4 100644 --- a/kokoro/presubmit.cfg +++ b/kokoro/presubmit.cfg @@ -1,6 +1,5 @@ -# Location of bash script that runs the test. The first directory in the path -# is the directory where Kokoro will check out the repo. The rest is the path -# is the path to the test script. +# This is a temporary file. It will be removed when new Kokoro jobs exist for +# all the other presubmits. build_file: "repo/kokoro/run_tests.sh" action { @@ -8,6 +7,5 @@ action { regex: "**/sponge_log.xml" regex: "**/sponge_log.log" regex: "**/outputs.zip" - regex: "**/runsc-logs.tar.gz" } } -- cgit v1.2.3 From 2bbf73d9ed85bbff81f1e56a6753dfe402682459 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Fri, 13 Sep 2019 11:38:40 -0700 Subject: Remove stale configurations. PiperOrigin-RevId: 268947847 --- cloudbuild/go.Dockerfile | 2 -- cloudbuild/go.yaml | 22 ---------------------- kokoro/continuous.cfg | 11 ----------- kokoro/presubmit.cfg | 11 ----------- kokoro/release-nightly.cfg | 10 ---------- kokoro/run_build.sh | 19 ------------------- kokoro/run_tests.sh | 29 ----------------------------- 7 files changed, 104 deletions(-) delete mode 100644 cloudbuild/go.Dockerfile delete mode 100644 cloudbuild/go.yaml delete mode 100644 kokoro/continuous.cfg delete mode 100644 kokoro/presubmit.cfg delete mode 100644 kokoro/release-nightly.cfg delete mode 100755 kokoro/run_build.sh delete mode 100644 kokoro/run_tests.sh (limited to 'kokoro/presubmit.cfg') diff --git a/cloudbuild/go.Dockerfile b/cloudbuild/go.Dockerfile deleted file mode 100644 index 226442fd2..000000000 --- a/cloudbuild/go.Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM ubuntu -RUN apt-get -q update && apt-get install -qqy git rsync diff --git a/cloudbuild/go.yaml b/cloudbuild/go.yaml deleted file mode 100644 index a38ef71fc..000000000 --- a/cloudbuild/go.yaml +++ /dev/null @@ -1,22 +0,0 @@ -steps: -- name: 'gcr.io/cloud-builders/git' - args: ['fetch', '--all', '--unshallow'] -- name: 'gcr.io/cloud-builders/bazel' - args: ['build', ':gopath'] -- name: 'gcr.io/cloud-builders/docker' - args: ['build', '-t', 'gcr.io/$PROJECT_ID/go-branch', '-f', 'cloudbuild/go.Dockerfile', '.'] -- name: 'gcr.io/$PROJECT_ID/go-branch' - args: ['tools/go_branch.sh'] -- name: 'gcr.io/cloud-builders/git' - args: ['checkout', 'go'] -- name: 'gcr.io/cloud-builders/git' - args: ['clean', '-f'] -- name: 'golang' - args: ['go', 'build', './...'] -- name: 'gcr.io/cloud-builders/git' - entrypoint: 'bash' - args: - - '-c' - - 'if [[ "$BRANCH_NAME" == "master" ]]; then git push "${_ORIGIN}" go:go; fi' -substitutions: - _ORIGIN: origin diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg deleted file mode 100644 index 88694220a..000000000 --- a/kokoro/continuous.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# This is a temporary file. It will be removed when new Kokoro jobs exist for -# all the other presubmits. -build_file: "repo/scripts/build.sh" - -action { - define_artifacts { - regex: "**/sponge_log.xml" - regex: "**/sponge_log.log" - regex: "**/outputs.zip" - } -} diff --git a/kokoro/presubmit.cfg b/kokoro/presubmit.cfg deleted file mode 100644 index eb0c78ea4..000000000 --- a/kokoro/presubmit.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# This is a temporary file. It will be removed when new Kokoro jobs exist for -# all the other presubmits. -build_file: "repo/kokoro/run_tests.sh" - -action { - define_artifacts { - regex: "**/sponge_log.xml" - regex: "**/sponge_log.log" - regex: "**/outputs.zip" - } -} diff --git a/kokoro/release-nightly.cfg b/kokoro/release-nightly.cfg deleted file mode 100644 index ae134258c..000000000 --- a/kokoro/release-nightly.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# This file is a temporary bridge. It will be removed shortly, when Kokoro jobs -# are configured to point at the new build and release configurations. -build_file: "repo/kokoro/run_build.sh" - -action { - define_artifacts { - regex: "**/runsc" - regex: "**/runsc.sha512" - } -} diff --git a/kokoro/run_build.sh b/kokoro/run_build.sh deleted file mode 100755 index da6a0c85e..000000000 --- a/kokoro/run_build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Copyright 2018 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. - -# This file is a temporary bridge. We will create multiple independent Kokoro -# workflows that call each of the build scripts independently. -KOKORO_BUILD_NIGHTLY=true $(dirname $0)/../scripts/build.sh diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh deleted file mode 100644 index 5552da11c..000000000 --- a/kokoro/run_tests.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Copyright 2019 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. - -set -xeo pipefail - -# This file is a temporary bridge. We will create multiple independent Kokoro -# workflows that call each of the test scripts independently. - -# Run all the tests in sequence. -$(dirname $0)/../scripts/do_tests.sh -$(dirname $0)/../scripts/make_tests.sh -$(dirname $0)/../scripts/root_tests.sh -$(dirname $0)/../scripts/docker_tests.sh -$(dirname $0)/../scripts/overlay_tests.sh -$(dirname $0)/../scripts/hostnet_tests.sh -$(dirname $0)/../scripts/simple_tests.sh -- cgit v1.2.3