Refactor e2e tests to use the service ClusterIP

build/build-e2e.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright 2019 The Kubernetes 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 -o errexit
+set -o nounset
+set -o pipefail
+
+ginkgo build ./test/e2e

build/e2e-tests.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# Copyright 2018 The Kubernetes 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 -o errexit
-set -o nounset
-set -o pipefail
-
-declare -a mandatory
-mandatory=(
-  NODE_IP
-  SLOW_E2E_THRESHOLD
-  PKG
-  FOCUS
-  E2E_NODES
-)
-
-missing=false
-for var in ${mandatory[@]}; do
-  if [[ -z "${!var+x}" ]]; then
-    echo "Environment variable $var must be set"
-    missing=true
-  fi
-done
-
-if [ "$missing" = true ];then
-  exit 1
-fi
-
-SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
-
-ginkgo build ./test/e2e
-
-echo "Running e2e test suite..."
-ginkgo                                       \
-    -randomizeSuites                         \
-    -randomizeAllSpecs                       \
-    -flakeAttempts=2                         \
-    -focus=${FOCUS}                          \
-    -skip="\[Serial\]"                       \
-    -p                                       \
-    -trace                                   \
-    -nodes=${E2E_NODES}                      \
-    -slowSpecThreshold=${SLOW_E2E_THRESHOLD} \
-    test/e2e/e2e.test
-
-echo "Running e2e test suite with tests that require serial execution..."
-ginkgo                                       \
-    -randomizeSuites                         \
-    -randomizeAllSpecs                       \
-    -flakeAttempts=2                         \
-    -focus="\[Serial\]"                      \
-    -p                                       \
-    -trace                                   \
-    -nodes=1                                 \
-    -slowSpecThreshold=${SLOW_E2E_THRESHOLD} \
-    test/e2e/e2e.test

build/go-in-docker.sh

@@ -50,18 +50,13 @@ tee .env << EOF
 PKG=${PKG:-""}
 ARCH=${ARCH:-""}
 GIT_COMMIT=${GIT_COMMIT:-""}
-E2E_NODES=${E2E_NODES:-4}
-FOCUS=${FOCUS:-.*}
 TAG=${TAG:-"0.0"}
 HOME=${HOME:-/root}
-KUBECONFIG=${HOME}/.kube/config
 GOARCH=${GOARCH}
 GOBUILD_FLAGS=${GOBUILD_FLAGS:-"-v"}
 PWD=${PWD}
 BUSTED_ARGS=${BUSTED_ARGS:-""}
 REPO_INFO=${REPO_INFO:-local}
-NODE_IP=${NODE_IP:-127.0.0.1}
-SLOW_E2E_THRESHOLD=${SLOW_E2E_THRESHOLD:-40}
 EOF
 
 MINIKUBE_PATH=${HOME}/.minikube