Skip to content

Commit

Permalink
fixes contrib doc bug kubernetes#4486 - kubetest replaces hack/e2e.go (
Browse files Browse the repository at this point in the history
…kubernetes#4563)

* fixes contrib doc bug kubernetes#4486 - kubetest replaces hack/e2e.go

* Update contributors/devel/sig-testing/e2e-tests.md

Restoring original list formatting for doc consistency.

Co-Authored-By: Bob Killen <killen.bob@gmail.com>

* Update contributors/devel/sig-testing/e2e-tests.md

Co-Authored-By: Bob Killen <killen.bob@gmail.com>

Co-authored-by: Bob Killen <killen.bob@gmail.com>
  • Loading branch information
RobertKielty and mrbobbytables authored Mar 10, 2020
1 parent 620067b commit 95fdc65
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
1 change: 0 additions & 1 deletion contributors/devel/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ make test WHAT=./pkg/apis/core/helper GOFLAGS=-v
make test-integration

# Run e2e tests by building test binaries, turn up a test cluster, run all tests, and tear the cluster down
# Equivalent to: go run hack/e2e.go -- -v --build --up --test --down
# Note: running all e2e tests takes a LONG time! To run specific e2e tests, visit:
# ./e2e-tests.md#building-kubernetes-and-running-the-tests
make test-e2e
Expand Down
2 changes: 1 addition & 1 deletion contributors/devel/sig-architecture/conformance-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ following branches:

Conformance tests are designed to be run even when there is no cloud provider
configured. Conformance tests must be able to be run against clusters that have
not been created with `hack/e2e.go`, just provide a kubeconfig with the
not been created with `test-infra/kubetest`, just provide a kubeconfig with the
appropriate endpoint and credentials.

These commands are intended to be run within a kubernetes directory, either
Expand Down
7 changes: 2 additions & 5 deletions contributors/devel/sig-node/node-performance-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,9 @@ sampling.

There is an end-to-end test for collecting overall resource usage of node
components: [kubelet_perf.go](https://git.k8s.io/kubernetes/test/e2e/node/kubelet_perf.go). To
run the test, simply make sure you have an e2e cluster running (`go run
hack/e2e.go -- -up`) and [set up](#cluster-set-up) correctly.
run the test, simply make sure you have an e2e cluster running (`kubetest --up`) and [set up](#cluster-set-up) correctly.

Run the test with `go run hack/e2e.go -- -v -test
--test_args="--ginkgo.focus=resource\susage\stracking"`. You may also wish to
customise the number of pods or other parameters of the test (remember to rerun
Run the test with `kubetest --test --test_args="--ginkgo.focus=resource\susage\stracking"`. You may also wish to customise the number of pods or other parameters of the test (remember to rerun
`make WHAT=test/e2e/e2e.test` after you do).

## Profiling
Expand Down
16 changes: 8 additions & 8 deletions contributors/devel/sig-testing/e2e-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ kubetest --provider=aws --build --up --test --down

The tests are built into a single binary which can be used to deploy a
Kubernetes system or run tests against an already-deployed Kubernetes system.
See `kubetest --help` (or the flag definitions in `hack/e2e.go`) for
more options, such as reusing an existing cluster.
See `kubetest --help` for more options, such as reusing an existing cluster.

### Cleaning up

Expand Down Expand Up @@ -249,20 +248,21 @@ set. The flags asks ginkgo to run the test repeatedly until it fails.

### Federation e2e tests

By default, `e2e.go` provisions a single Kubernetes cluster, and any `Feature:Federation` ginkgo tests will be skipped.
By default, `kubetest` provisions a single Kubernetes cluster, and any `Feature:Federation` ginkgo tests will be skipped.

Federation e2e testing involve bringing up multiple "underlying" Kubernetes clusters,
Federation e2e testing involves bringing up multiple "underlying" Kubernetes clusters,
and deploying the federation control plane as a Kubernetes application on the underlying clusters.

The federation e2e tests are still managed via `e2e.go`, but require some extra configuration items.
-The federation e2e tests are still managed via `kubetest`, but require some extra configuration items.-

#### Configuring federation e2e tests

The following environment variables will enable federation e2e building, provisioning and testing.

```sh
$ export FEDERATION=true
$ export E2E_ZONES="us-central1-a us-central1-b us-central1-f"
export FEDERATION=true
export E2E_ZONES="us-central1-a us-central1-b us-central1-f"

```

A Kubernetes cluster will be provisioned in each zone listed in `E2E_ZONES`. A zone can only appear once in the `E2E_ZONES` list.
Expand Down Expand Up @@ -297,7 +297,7 @@ Next, specify the docker repository where your ci images will be pushed.
Given this example, the `federation-apiserver` container image will be pushed to the repository
`quay.io/colin_hom/federation-apiserver`.

The docker client on the machine running `e2e.go` must have push access for the following pre-existing repositories:
The docker client on the machine running `kubetest` must have push access for the following pre-existing repositories:

* `${FEDERATION_PUSH_REPO_BASE}/federation-apiserver`
* `${FEDERATION_PUSH_REPO_BASE}/federation-controller-manager`
Expand Down

0 comments on commit 95fdc65

Please sign in to comment.