diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/internal_ci/linux/grpc_bazel_build.cfg | 2 | ||||
-rwxr-xr-x | tools/internal_ci/linux/grpc_bazel_build_in_docker.sh (renamed from tools/jenkins/run_bazel_basic_in_docker.sh) | 0 | ||||
-rw-r--r-- | tools/internal_ci/linux/grpc_bazel_test.cfg | 2 | ||||
-rwxr-xr-x | tools/internal_ci/linux/grpc_bazel_test_in_docker.sh (renamed from tools/jenkins/run_bazel_full_in_docker.sh) | 0 | ||||
-rwxr-xr-x | tools/jenkins/run_bazel_basic.sh | 23 | ||||
-rwxr-xr-x | tools/jenkins/run_bazel_full.sh | 23 |
6 files changed, 2 insertions, 48 deletions
diff --git a/tools/internal_ci/linux/grpc_bazel_build.cfg b/tools/internal_ci/linux/grpc_bazel_build.cfg index 4d3a2ade5d..59f5da9a67 100644 --- a/tools/internal_ci/linux/grpc_bazel_build.cfg +++ b/tools/internal_ci/linux/grpc_bazel_build.cfg @@ -19,5 +19,5 @@ build_file: "grpc/tools/internal_ci/linux/grpc_bazel.sh" timeout_mins: 60 env_vars { key: "BAZEL_SCRIPT" - value: "tools/jenkins/run_bazel_basic_in_docker.sh" + value: "tools/internal_ci/linux/grpc_bazel_build_in_docker.sh" } diff --git a/tools/jenkins/run_bazel_basic_in_docker.sh b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh index 24598f43f0..24598f43f0 100755 --- a/tools/jenkins/run_bazel_basic_in_docker.sh +++ b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh diff --git a/tools/internal_ci/linux/grpc_bazel_test.cfg b/tools/internal_ci/linux/grpc_bazel_test.cfg index 46198b9600..6b03be9518 100644 --- a/tools/internal_ci/linux/grpc_bazel_test.cfg +++ b/tools/internal_ci/linux/grpc_bazel_test.cfg @@ -19,5 +19,5 @@ build_file: "grpc/tools/internal_ci/linux/grpc_bazel.sh" timeout_mins: 240 env_vars { key: "BAZEL_SCRIPT" - value: "tools/jenkins/run_bazel_full_in_docker.sh" + value: "tools/internal_ci/linux/grpc_bazel_test_in_docker.sh" } diff --git a/tools/jenkins/run_bazel_full_in_docker.sh b/tools/internal_ci/linux/grpc_bazel_test_in_docker.sh index 9663debe69..9663debe69 100755 --- a/tools/jenkins/run_bazel_full_in_docker.sh +++ b/tools/internal_ci/linux/grpc_bazel_test_in_docker.sh diff --git a/tools/jenkins/run_bazel_basic.sh b/tools/jenkins/run_bazel_basic.sh deleted file mode 100755 index 65a485abfb..0000000000 --- a/tools/jenkins/run_bazel_basic.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2017 gRPC 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. -# -# Test basic Bazel features -# -# NOTE: No empty lines should appear in this file before igncr is set! -set -ex -o igncr || set -ex - -export DOCKERFILE_DIR=tools/dockerfile/test/bazel -export DOCKER_RUN_SCRIPT=tools/jenkins/run_bazel_basic_in_docker.sh -exec tools/run_tests/dockerize/build_and_run_docker.sh diff --git a/tools/jenkins/run_bazel_full.sh b/tools/jenkins/run_bazel_full.sh deleted file mode 100755 index 3436a8f8b6..0000000000 --- a/tools/jenkins/run_bazel_full.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2017 gRPC 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. -# -# Test full Bazel -# -# NOTE: No empty lines should appear in this file before igncr is set! -set -ex -o igncr || set -ex - -export DOCKERFILE_DIR=tools/dockerfile/test/bazel -export DOCKER_RUN_SCRIPT=tools/jenkins/run_bazel_full_in_docker.sh -exec tools/run_tests/dockerize/build_and_run_docker.sh |