Merge pull request #21439 from apolcyn/revert_grpclb_in_dns_interop

Delete unused grpclb-in-dns interop test suite

templates/tools/run_tests/generated/lb_interop_test_scenarios.json.template

@@ -1,6 +0,0 @@
-%YAML 1.2
---- |
-  <%!
-  import json
-  %>
-  ${json.dumps(lb_interop_test_scenarios, indent=4, sort_keys=True)}

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=""

tools/dockerfile/interoptest/lb_interop_fake_servers/build_interop.sh

@@ -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

tools/internal_ci/helper_scripts/prepare_build_grpclb_interop_rc

@@ -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

tools/internal_ci/linux/grpc_run_grpclb_interop_tests.sh

@@ -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

tools/internal_ci/linux/grpclb_in_dns_interop.cfg

@@ -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/**"
-  }
-}