Skip to content

Commit 6f7182e

Browse files
committed
Remove hack/e2e-test.sh in favor of hack/e2e.go.
1 parent 58ab75a commit 6f7182e

File tree

7 files changed

+9
-29
lines changed

7 files changed

+9
-29
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ test_integration:
9898
# Example:
9999
# make test_e2e
100100
test_e2e:
101-
hack/e2e-test.sh
101+
go run hack/e2e.go -v --build --up --test --down
102102
.PHONY: test_e2e
103103

104104
# Remove all build artifacts.

cluster/aws/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ function kube-push {
14131413
}
14141414

14151415
# -----------------------------------------------------------------------------
1416-
# Cluster specific test helpers used from hack/e2e-test.sh
1416+
# Cluster specific test helpers used from hack/e2e.go
14171417

14181418
# Execute prior to running tests to build a release if required for env.
14191419
#

cluster/gce/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ function kube-push {
11801180
}
11811181

11821182
# -----------------------------------------------------------------------------
1183-
# Cluster specific test helpers used from hack/e2e-test.sh
1183+
# Cluster specific test helpers used from hack/e2e.go
11841184

11851185
# Execute prior to running tests to build a release if required for env.
11861186
#

cluster/gke/util.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ function restart-apiserver() {
282282
}
283283

284284
# Execute after running tests to perform any required clean-up. This is called
285-
# from hack/e2e-test.sh. This calls kube-down, so the cluster still exists when
286-
# this is called.
285+
# from hack/e2e.go. This calls kube-down, so the cluster still exists when this
286+
# is called.
287287
#
288288
# Assumed vars:
289289
# CLUSTER_NAME

docs/devel/developer-guides/vagrant.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ Congratulations!
302302
The following will run all of the end-to-end testing scenarios assuming you set your environment in `cluster/kube-env.sh`:
303303

304304
```sh
305-
NUM_NODES=3 hack/e2e-test.sh
305+
NUM_NODES=3 go run hack/e2e.go -v --build --up --test --down
306306
```
307307

308308
### Troubleshooting

hack/conformance-test.sh

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

hack/e2e-test.sh

-20
This file was deleted.

0 commit comments

Comments
 (0)