From 70f3a25125644c1f975b8e7f7a93bb7a83268029 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 10 Dec 2019 15:08:01 -0800 Subject: [PATCH] Delete unused grpclb-in-dns interop test suite --- .../lb_interop_test_scenarios.json.template | 6 ---- tools/buildgen/generate_build_additions.sh | 3 +- .../lb_interop_fake_servers/build_interop.sh | 35 ------------------- .../prepare_build_grpclb_interop_rc | 33 ----------------- .../linux/grpc_run_grpclb_interop_tests.sh | 26 -------------- .../linux/grpclb_in_dns_interop.cfg | 25 ------------- 6 files changed, 1 insertion(+), 127 deletions(-) delete mode 100644 templates/tools/run_tests/generated/lb_interop_test_scenarios.json.template delete mode 100644 tools/dockerfile/interoptest/lb_interop_fake_servers/build_interop.sh delete mode 100644 tools/internal_ci/helper_scripts/prepare_build_grpclb_interop_rc delete mode 100755 tools/internal_ci/linux/grpc_run_grpclb_interop_tests.sh delete mode 100644 tools/internal_ci/linux/grpclb_in_dns_interop.cfg diff --git a/templates/tools/run_tests/generated/lb_interop_test_scenarios.json.template b/templates/tools/run_tests/generated/lb_interop_test_scenarios.json.template deleted file mode 100644 index 18d71a7c84e..00000000000 --- a/templates/tools/run_tests/generated/lb_interop_test_scenarios.json.template +++ /dev/null @@ -1,6 +0,0 @@ -%YAML 1.2 ---- | - <%! - import json - %> - ${json.dumps(lb_interop_test_scenarios, indent=4, sort_keys=True)} diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh index 9ad98786fda..0ed9b1ec717 100755 --- a/tools/buildgen/generate_build_additions.sh +++ b/tools/buildgen/generate_build_additions.sh @@ -25,8 +25,7 @@ gen_build_yaml_dirs=" \ src/zlib \ src/c-ares \ test/core/end2end \ - test/cpp/naming \ - tools/run_tests/lb_interop_tests" + test/cpp/naming" gen_build_files="" diff --git a/tools/dockerfile/interoptest/lb_interop_fake_servers/build_interop.sh b/tools/dockerfile/interoptest/lb_interop_fake_servers/build_interop.sh deleted file mode 100644 index 1846d517538..00000000000 --- a/tools/dockerfile/interoptest/lb_interop_fake_servers/build_interop.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# Copyright 2015 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. -# -# Gets a built Go interop server, fake balancer server, and python -# DNS server into a base image. -set -e - -# Clone just the grpc-go source code without any dependencies. -# We are cloning from a local git repo that contains the right revision -# to test instead of using "go get" to download from Github directly. -git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc - -# Get all gRPC Go dependencies -(cd src/google.golang.org/grpc && make deps && make testdeps) - -# Build the interop server and fake balancer -(cd src/google.golang.org/grpc/interop/server && go install) -(cd src/google.golang.org/grpc/interop/fake_grpclb && go install) - -# Clone the grpc/grpc repo to get the python DNS server. -# Hack: we don't need to init submodules for the scripts we need. -mkdir -p /var/local/git/grpc -git clone /var/local/jenkins/grpc /var/local/git/grpc diff --git a/tools/internal_ci/helper_scripts/prepare_build_grpclb_interop_rc b/tools/internal_ci/helper_scripts/prepare_build_grpclb_interop_rc deleted file mode 100644 index a8e350be580..00000000000 --- a/tools/internal_ci/helper_scripts/prepare_build_grpclb_interop_rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/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. - -# Source this rc script to prepare the environment for interop builds -# This rc script must be used in the root directory of gRPC - -export LANG=en_US.UTF-8 - -# Download Docker images from DockerHub -export DOCKERHUB_ORGANIZATION=grpctesting - -git submodule update --init - -# Set up gRPC-Go and gRPC-Java to test -git clone --recursive https://github.com/grpc/grpc-go ./../grpc-go -git clone --recursive https://github.com/grpc/grpc-java ./../grpc-java - -# TODO(apolcyn): move to kokoro image? -virtualenv env -source env/bin/activate -pip install twisted diff --git a/tools/internal_ci/linux/grpc_run_grpclb_interop_tests.sh b/tools/internal_ci/linux/grpc_run_grpclb_interop_tests.sh deleted file mode 100755 index 806b5c947ed..00000000000 --- a/tools/internal_ci/linux/grpc_run_grpclb_interop_tests.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/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. - -set -ex - -export LANG=en_US.UTF-8 - -# Enter the gRPC repo root -cd $(dirname $0)/../../.. - -source tools/internal_ci/helper_scripts/prepare_build_linux_rc -source tools/internal_ci/helper_scripts/prepare_build_grpclb_interop_rc - -tools/run_tests/run_grpclb_interop_tests.py -l all --scenarios_file=tools/run_tests/generated/lb_interop_test_scenarios.json diff --git a/tools/internal_ci/linux/grpclb_in_dns_interop.cfg b/tools/internal_ci/linux/grpclb_in_dns_interop.cfg deleted file mode 100644 index 6cd5f2e21a5..00000000000 --- a/tools/internal_ci/linux/grpclb_in_dns_interop.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# 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. - -# Config file for the internal CI (in protobuf text format) - -# Location of the continuous shell script in repository. -build_file: "grpc/tools/internal_ci/linux/grpc_run_grpclb_interop_tests.sh" -timeout_mins: 60 -action { - define_artifacts { - regex: "**/sponge_log.xml" - regex: "github/grpc/reports/**" - } -}