From 80fd6da07d1fd440ca556cbc289c6c0945797710 Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Thu, 3 Nov 2022 08:39:31 -0400 Subject: [PATCH 1/3] KO_DATA_PATH doesn't need to be set anymore (#244) We read the version control from the go binary now --- e2e-tests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e-tests.sh b/e2e-tests.sh index 12cb6d61..77c01eca 100755 --- a/e2e-tests.sh +++ b/e2e-tests.sh @@ -60,6 +60,7 @@ function setup_test_cluster() { header "Setting up test cluster" kubectl get nodes + # Set the actual project the test cluster resides in # It will be a project assigned by Boskos if test is running on Prow, # otherwise will be ${E2E_GCP_PROJECT_ID} set up by user. @@ -90,8 +91,6 @@ function setup_test_cluster() { echo "- Cluster is ${k8s_cluster}" echo "- Docker is ${KO_DOCKER_REPO}" - export KO_DATA_PATH="${REPO_ROOT_DIR}/.git" - # Do not run teardowns if we explicitly want to skip them. (( ! SKIP_TEARDOWNS )) && add_trap teardown_test_resources EXIT From f5be74f951d00eac883282fd0604003bc6065b37 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 3 Nov 2022 12:50:31 +0000 Subject: [PATCH 2/3] Update community files (#245) Signed-off-by: Knative Automation Signed-off-by: Knative Automation --- OWNERS_ALIASES | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 986004cc..83fbbbb2 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -43,13 +43,11 @@ aliases: - akashrv - lberk eventing-wg-leads: - - lionelvillard - pierDipi eventing-writers: - akashrv - aliok - lberk - - lionelvillard - matzew - odacremolbap - pierDipi @@ -108,11 +106,9 @@ aliases: - tcnghia - vagababov - yanweiguo - networking-wg-leads: - - nak3 + networking-wg-leads: [] networking-writers: - JRBANCEL - - nak3 - vagababov operations-reviewers: - Cynocracy From 62b15bd8b2b31dfc528fdc7b1ff12c6d1efe24c7 Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Thu, 3 Nov 2022 09:29:26 -0400 Subject: [PATCH 3/3] drop support for the istio add on flag (#243) * drop support for the istio add on flag * update test --- README.md | 3 --- e2e-tests.sh | 12 ++---------- test/unit/presubmit_test.go | 2 +- test/unit/run_e2e_test.go | 1 - 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 89cae268..607bc897 100644 --- a/README.md +++ b/README.md @@ -149,9 +149,6 @@ This is a helper script for Knative E2E test scripts. To use it: 1. By default `knative_teardown()` and `test_teardown()` will be called after the tests finish, use `--skip-teardowns` if you don't want them to be called. -1. By default Istio is installed on the cluster via Addon, use - `--skip-istio-addon` if you choose not to have it preinstalled. - 1. By default Google Kubernetes Engine telemetry to Cloud Logging and Monitoring is disabled. This can be enabled by setting `ENABLE_GKE_TELEMETRY` to `true`. diff --git a/e2e-tests.sh b/e2e-tests.sh index 77c01eca..cb186a4e 100755 --- a/e2e-tests.sh +++ b/e2e-tests.sh @@ -98,9 +98,6 @@ function setup_test_cluster() { set +o errexit set +o pipefail - # Wait for Istio installation to complete, if necessary, before calling knative_setup. - # TODO(chizhg): is it really needed? - (( ! SKIP_ISTIO_ADDON )) && (wait_until_batch_job_complete istio-system || return 1) if function_exists knative_setup; then knative_setup || fail_test "Knative setup failed" fi @@ -130,7 +127,6 @@ function fail_test() { } SKIP_TEARDOWNS=0 -SKIP_ISTIO_ADDON=0 E2E_SCRIPT="" CLOUD_PROVIDER="gke" @@ -170,8 +166,8 @@ function initialize() { case ${parameter} in --run-tests) run_tests=1 ;; --skip-teardowns) SKIP_TEARDOWNS=1 ;; - # TODO(chizhg): remove this flag once the addons is defined as an env var. - --skip-istio-addon) SKIP_ISTIO_ADDON=1 ;; + --skip-istio-addon) echo "--skip-istio-addon is no longer supported" + ;; # This flag is a noop *) case ${parameter} in --cloud-provider) shift; CLOUD_PROVIDER="$1" ;; @@ -184,11 +180,7 @@ function initialize() { (( IS_PROW )) && [[ -z "${GCP_PROJECT_ID:-}" ]] && IS_BOSKOS=1 if [[ "${CLOUD_PROVIDER}" == "gke" ]]; then - if (( SKIP_ISTIO_ADDON )); then custom_flags+=("--addons=NodeLocalDNS") - else - custom_flags+=("--addons=Istio,NodeLocalDNS") - fi fi readonly IS_BOSKOS diff --git a/test/unit/presubmit_test.go b/test/unit/presubmit_test.go index 8bd80fc3..5d26d23a 100644 --- a/test/unit/presubmit_test.go +++ b/test/unit/presubmit_test.go @@ -53,7 +53,7 @@ func TestMainFunc(t *testing.T) { "--enable-workload-identity --cluster-version=latest "+ "--extra-gcloud-flags --enable-stackdriver-kubernetes "+ "--no-enable-ip-alias --no-enable-autoupgrade "+ - "--addons=Istio,NodeLocalDNS "+ + "--addons=NodeLocalDNS "+ "--test-command=%s/test/e2e-tests.sh "+ "--run-tests --extra-gcloud-flags= --logging=NONE "+ "--monitoring=NONE", rootDir)), diff --git a/test/unit/run_e2e_test.go b/test/unit/run_e2e_test.go index 34643b8e..01d13e44 100644 --- a/test/unit/run_e2e_test.go +++ b/test/unit/run_e2e_test.go @@ -15,7 +15,6 @@ func TestRunE2eTests(t *testing.T) { stdout: []check{ contains("SETTING UP TEST CLUSTER"), contains("Cluster is gke_deadbeef_1.24"), - contains("kubectl wait job --for=condition=Complete --all -n istio-system --timeout=5m"), contains("STARTING KNATIVE SERVING"), contains("Waiting until all pods in namespace knative-serving are up"), contains("E2E TESTS PASSED"),