Skip to content

Commit

Permalink
Delete unused scripts and references to deleted e2e tests (#22348)
Browse files Browse the repository at this point in the history
  • Loading branch information
dgn authored Mar 23, 2020
1 parent e2758bb commit 998993a
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 177 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ tests/integration/component/proxy/envoy.conf
# Certs generated by testing
security/cmd/node_agent/na/cert_file
security/cmd/node_agent/na/pkey
# Test artifacts
tests/e2e/local/minikube/docker-machine-driver-hyperkit
# istioctl bash completion file
tools/istioctl.bash
vendor
Expand Down
3 changes: 0 additions & 3 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ Makefile* @istio/wg-test-
/samples/ @istio/wg-docs-maintainers
/security/ @istio/wg-security-maintainers
/tests/ @istio/wg-test-and-release-maintainers
/tests/e2e/local/ @istio/wg-test-and-release-maintainers
/tests/e2e/tests/mixer/ @istio/wg-policies-and-telemetry-maintainers
/tests/e2e/tests/pilot/ @istio/wg-networking-maintainers
/tests/integration/conformance/ @istio/wg-test-and-release-maintainers
/tests/integration/framework/ @istio/wg-test-and-release-maintainers
/tests/integration/galley/ @istio/wg-networking-maintainers
Expand Down
14 changes: 0 additions & 14 deletions Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -581,20 +581,6 @@ istio-demo.yaml istio-remote.yaml istio-minimal.yaml: $(HOME)/.helm
--values install/kubernetes/helm/istio/values-$@ \
install/kubernetes/helm/istio >> install/kubernetes/$@

e2e_files = istio-auth-non-mcp.yaml \
istio-auth-sds.yaml \
istio-non-mcp.yaml \
istio.yaml \
istio-auth.yaml \
istio-auth-mcp.yaml \
istio-auth-multicluster.yaml \
istio-mcp.yaml \
istio-one-namespace.yaml \
istio-one-namespace-auth.yaml \
istio-one-namespace-trust-domain.yaml \
istio-multicluster.yaml \
istio-multicluster-split-horizon.yaml

FILES_TO_CLEAN+=install/consul/istio.yaml \
install/kubernetes/istio-auth.yaml \
install/kubernetes/istio-citadel-plugin-certs.yaml \
Expand Down
1 change: 0 additions & 1 deletion codecov.skip
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ istio.io/istio/pkg/mcp/testing
istio.io/istio/pkg/test
istio.io/istio/samples
istio.io/istio/tests/codecov
istio.io/istio/tests/e2e
istio.io/istio/tests/binary
istio.io/istio/tests/integration2/examples
istio.io/istio/tests/integration2/qualification
Expand Down
106 changes: 0 additions & 106 deletions prow/e2e-kind-suite.sh

This file was deleted.

10 changes: 1 addition & 9 deletions prow/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ function download_untar_istio_release() {
tar -xzf "${dir}/istio-${tag}-linux.tar.gz" -C "${dir}"
}

function build_images_legacy() {
# Build just the images needed for the legacy e2e tests that use the install/ directory
targets="docker.pilot docker.proxyv2 "
targets+="docker.app docker.test_policybackend "
targets+="docker.mixer docker.galley"
DOCKER_BUILD_VARIANTS="${VARIANT:-default}" DOCKER_TARGETS="${targets}" make dockerx
}

function build_images() {
# Build just the images needed for tests
targets="docker.pilot docker.proxyv2 "
Expand Down Expand Up @@ -142,7 +134,7 @@ function setup_kind_cluster() {
IMAGE="${2:-kindest/node:v1.17.0}"
NAME="${3:-istio-testing}"
CONFIG="${4:-}"
# Delete any previous e2e KinD cluster
# Delete any previous KinD cluster
echo "Deleting previous KinD cluster with name=${NAME}"
if ! (kind delete cluster --name="${NAME}" -v9) > /dev/null; then
echo "No existing kind cluster with name ${NAME}. Continue..."
Expand Down
2 changes: 1 addition & 1 deletion samples/bookinfo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ build_push_update_images.sh <version>

## Tests

Bookinfo is tested by e2e smoke test on every PR. The Bookinfo e2e test is in [tests/e2e/tests/bookinfo](https://github.com/istio/istio/tree/master/tests/e2e/tests/bookinfo), make target `e2e_bookinfo`.
Bookinfo is tested by istio.io integration tests. You can find them under [tests/examples](https://github.com/istio/istio.io/tree/master/tests/examples) in the [istio/istio.io](https://github.com/istio/istio.io) repository.

The reference productpage HTML files are in [tests/apps/bookinfo/output](https://github.com/istio/istio/tree/master/tests/apps/bookinfo/output). If the productpage HTML produced by the app is changed, remember to regenerate the reference HTML files and commit them with the same PR.
41 changes: 0 additions & 41 deletions tests/e2e_istio_preinstalled.sh

This file was deleted.

0 comments on commit 998993a

Please sign in to comment.