scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove hack/e2e-test.sh in favor of hack/e2e.go.

Browse Source
This commit is contained in:
Joe Finney
2016-02-16 14:54:50 -08:00
parent 58ab75a69a
commit 6f7182e500
7 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

2
cluster/aws/util.sh
View File

@@ -1413,7 +1413,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. # Execute prior to running tests to build a release if required for env.
# #

2
cluster/gce/util.sh
View File

@@ -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. # Execute prior to running tests to build a release if required for env.
# #

4
cluster/gke/util.sh
View File

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

2
docs/devel/developer-guides/vagrant.md
View File

@@ -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`: The following will run all of the end-to-end testing scenarios assuming you set your environment in `cluster/kube-env.sh`:
```sh ```sh
NUM_NODES=3 hack/e2e-test.sh NUM_NODES=3 go run hack/e2e.go -v --build --up --test --down
``` ```
### Troubleshooting ### Troubleshooting

6
hack/conformance-test.sh
View File

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

20
hack/e2e-test.sh
View File

@@ -1,20 +0,0 @@
#!/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 $?