diff --git a/.gitignore b/.gitignore index 5a5c9e6b55a..07e917280cd 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/CODEOWNERS b/CODEOWNERS index 59cc1f36b71..fcb1b081d14 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -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 diff --git a/Makefile.core.mk b/Makefile.core.mk index a67279e4942..600dd9378ef 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -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 \ diff --git a/codecov.skip b/codecov.skip index f44425d5261..13a17cfb116 100644 --- a/codecov.skip +++ b/codecov.skip @@ -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 diff --git a/prow/e2e-kind-suite.sh b/prow/e2e-kind-suite.sh deleted file mode 100755 index 58a1f027537..00000000000 --- a/prow/e2e-kind-suite.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Istio Authors -# -# 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. - - -####################################################### -# e2e-suite runs Istio E2E tests. # -# # -# Usage: ./e2e-kind-suite.sh --single_test mixer_e2e # -# # -# ${E2E_ARGS} can be used to provide additional test # -# arguments. # -####################################################### - -WD=$(dirname "$0") -WD=$(cd "$WD"; pwd) -ROOT=$(dirname "$WD") - -# Exit immediately for non zero status -set -e -# Check unset variables -set -u -# Print commands -set -x - -# shellcheck source=prow/lib.sh -source "${ROOT}/prow/lib.sh" -setup_and_export_git_sha - -# getopts only handles single character flags -for ((i=1; i<=$#; i++)); do - case ${!i} in - # Node images can be found at https://github.com/kubernetes-sigs/kind/releases - # For example, kindest/node:v1.14.0 - --node-image) - ((i++)) - NODE_IMAGE=${!i} - ;; - --skip-setup) - SKIP_SETUP=true - continue - ;; - --skip-build) - SKIP_BUILD=true - continue - ;; - --skip-cleanup) - SKIP_CLEANUP=true - continue - ;; - # -s/--single_test to specify test target to run. - # e.g. "-s e2e_mixer" will trigger e2e mixer_test - -s|--single_test) ((i++)); SINGLE_TEST=${!i} - continue - ;; - --variant) ((i++)); VARIANT="${!i}" - continue - ;; - esac - E2E_ARGS+=( "${!i}" ) -done - - -E2E_ARGS+=("--test_logs_path=${ARTIFACTS}") -# e2e tests with kind clusters on prow will get deleted when prow deletes the pod -E2E_ARGS+=("--skip_cleanup") -E2E_ARGS+=("--use_local_cluster") - -# KinD will have the images loaded into it; it should not attempt to pull them -# See https://kind.sigs.k8s.io/docs/user/quick-start/#loading-an-image-into-your-cluster -E2E_ARGS+=("--image_pull_policy" "IfNotPresent") - -export HUB=${HUB:-"istio-testing"} -export TAG="${TAG:-"istio-testing"}" - -# Default IP family of the cluster is IPv4 -export IP_FAMILY="${IP_FAMILY:-ipv4}" - -make init - -if [[ -z "${SKIP_SETUP:-}" ]]; then - time setup_kind_cluster "${IP_FAMILY}" "${NODE_IMAGE:-}" -fi - -if [[ -z "${SKIP_BUILD:-}" ]]; then - time build_images_legacy - time kind_load_images "" -fi - -if [[ "${ENABLE_ISTIO_CNI:-false}" == true ]]; then - cni_run_daemon_kind -fi - -time make with_junit_report E2E_ARGS="${E2E_ARGS[*]}" TARGET="${SINGLE_TEST}" ${VARIANT:+ VARIANT="${VARIANT}"} diff --git a/prow/lib.sh b/prow/lib.sh index 0d489d94b22..e8da21f85ca 100755 --- a/prow/lib.sh +++ b/prow/lib.sh @@ -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 " @@ -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..." diff --git a/samples/bookinfo/README.md b/samples/bookinfo/README.md index 993beaefeb7..b2e2ed1f5eb 100644 --- a/samples/bookinfo/README.md +++ b/samples/bookinfo/README.md @@ -26,6 +26,6 @@ build_push_update_images.sh ## 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. diff --git a/tests/e2e_istio_preinstalled.sh b/tests/e2e_istio_preinstalled.sh deleted file mode 100755 index 8d1193227ee..00000000000 --- a/tests/e2e_istio_preinstalled.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# -# Copyright 2017,2018 Istio 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. -# - -# Script entry into Istio smoketest run with a k8s cluster with Istio installed. -# This is intended as a smoketest for external callers that require a simple -# script entry point. $WORKSPACE is the root dir into which the Istio repo is -# expected to be cloned at the desired version. -# -# Usage: e2e_istio_preinstalled.sh all|bookinfo|mixer|simple - -set -o errexit -set -o nounset -set -o pipefail - -[[ $1 == "all" || $1 == "bookinfo" || $1 == "mixer" || $1 == "simple" ]] || { echo "$1 is not a legal test name"; exit 1; } - -declare -a tests -[[ $1 == "all" ]] && tests=("bookinfo" "mixer" "simple") || tests=("$1") - -cd "$(dirname "${BASH_SOURCE[0]}")"/.. -git checkout "${TAG}" -make init - -for t in "${tests[@]}"; do - make "e2e_${t}" E2E_ARGS="--skip_setup --namespace=istio-system --istioctl_url=https://storage.googleapis.com/istio-artifacts/pilot/${TAG}/artifacts/istioctl" -done -