Merge pull request #21342 from spxtr/remove-e2e-test

Makefile

@@ -98,7 +98,7 @@ test_integration:
 # Example:
 #   make test_e2e
 test_e2e:
-	hack/e2e-test.sh
+	go run hack/e2e.go -v --build --up --test --down
 .PHONY: test_e2e
 
 # Remove all build artifacts.

cluster/aws/util.sh

@@ -1434,7 +1434,7 @@ function kube-push {
 }
 
 # -----------------------------------------------------------------------------
-# Cluster specific test helpers used from hack/e2e-test.sh
+# Cluster specific test helpers used from hack/e2e.go
 
 # Execute prior to running tests to build a release if required for env.
 #

cluster/gce/util.sh

@@ -1180,7 +1180,7 @@ function kube-push {
 }
 
 # -----------------------------------------------------------------------------
-# Cluster specific test helpers used from hack/e2e-test.sh
+# Cluster specific test helpers used from hack/e2e.go
 
 # Execute prior to running tests to build a release if required for env.
 #

cluster/gke/util.sh

@@ -282,8 +282,8 @@ function restart-apiserver() {
 }
 
 # Execute after running tests to perform any required clean-up.  This is called
-# from hack/e2e-test.sh. This calls kube-down, so the cluster still exists when
-# this is called.
+# from hack/e2e.go. This calls kube-down, so the cluster still exists when this
+# is called.
 #
 # Assumed vars:
 #   CLUSTER_NAME

docs/devel/developer-guides/vagrant.md

@@ -302,7 +302,7 @@ Congratulations!
 The following will run all of the end-to-end testing scenarios assuming you set your environment in `cluster/kube-env.sh`:
 
 ```sh
-NUM_NODES=3 hack/e2e-test.sh
+NUM_NODES=3 go run hack/e2e.go -v --build --up --test --down
 ```
 
 ### Troubleshooting

hack/conformance-test.sh

@@ -39,13 +39,13 @@
 # About the conformance test:
 # The conformance test checks whether a kubernetes cluster supports
 # a minimum set of features to be called "Kubernetes".  It is similar
-# to `hack/e2e-test.sh` but it differs in that:
-#  - hack/e2e-test.sh is intended to test a cluster with binaries built at HEAD,
+# to `hack/e2e.go` but it differs in that:
+#  - hack/e2e.go is intended to test a cluster with binaries built at HEAD,
 #    while this conformance test does not care what version the binaries are.
 #    - this means the user needs to setup a cluster first.
 #    - this means the user does not need to write any cluster/... scripts.  Custom
 #      clusters can be tested.
-#  - hack/e2e-test.sh is intended to run e2e tests built at HEAD, while
+#  - hack/e2e.go is intended to run e2e tests built at HEAD, while
 #    this conformance test is intended to be run e2e tests built at a particular
 #    version.  This ensures that all conformance testees run the same set of tests,
 #    regardless of when they test for conformance.

hack/e2e-test.sh

-#!/bin/bash
-
-# Copyright 2014 The Kubernetes Authors All rights reserved.
-#
-# 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.
-
-# Provided for backwards compatibility
-go run "$(dirname $0)/e2e.go" -v -build -up -test -down
-
-exit $?