Merge pull request #4186 from stevekuznetsov/skuznets/remove-old-scripts

HOSTEDCP-1446: hack: remove old arguments and scripts
openshift · Jun 12, 2024 · eea912a · eea912a
2 parents 37de5ab + e0b8c0f
commit eea912a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -23,8 +23,6 @@ GO=GO111MODULE=on GOFLAGS=-mod=vendor go
 GO_BUILD_RECIPE=CGO_ENABLED=1 $(GO) build $(GO_GCFLAGS)
 GO_E2E_RECIPE=CGO_ENABLED=1 $(GO) test $(GO_GCFLAGS) -tags e2e -c
 
-CI_TESTS_RUN ?= ""
-
 OUT_DIR ?= bin
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -280,14 +278,6 @@ ci-install-hypershift-private:
 		--external-dns-domain-filter=service.ci.hypershift.devcluster.openshift.com \
 		--wait-until-available
 
-.PHONY: ci-test-e2e
-ci-test-e2e:
-	hack/ci-test-e2e.sh ${CI_TESTS_RUN}
-
-.PHONY: ci-test-e2e-azure
-ci-test-e2e-azure:
-	hack/ci-test-e2e-azure.sh
-
 .PHONY: regenerate-pki
 regenerate-pki:
 	REGENERATE_PKI=1 $(GO) test ./control-plane-pki-operator/...

diff --git a/hack/ci-test-e2e-azure.sh b/hack/ci-test-e2e-azure.sh
diff --git a/hack/ci-test-e2e.sh b/hack/ci-test-e2e.sh
@@ -31,46 +31,6 @@ generate_junit() {
 }
 trap generate_junit EXIT
 
-REQUEST_SERVING_COMPONENT_TEST="${REQUEST_SERVING_COMPONENT_TEST:-}"
-REQUEST_SERVING_COMPONENT_PARAMS=""
-
-if [[ -n "${REQUEST_SERVING_COMPONENT_TEST}" ]]; then
-   REQUEST_SERVING_COMPONENT_PARAMS="--e2e.test-request-serving-isolation \
-  --e2e.management-parent-kubeconfig=${MGMT_PARENT_KUBECONFIG} \
-  --e2e.management-cluster-namespace=$(cat "${SHARED_DIR}/management_cluster_namespace") \
-  --e2e.management-cluster-name=$(cat "${SHARED_DIR}/management_cluster_name")"
-fi
-
-declare -a default_args=(
-  -test.v
-  -test.run=${CI_TESTS_RUN}
-  -test.parallel=20 \
-  --e2e.aws-credentials-file=/etc/hypershift-pool-aws-credentials/credentials \
-  --e2e.aws-zones=us-east-1a,us-east-1b,us-east-1c \
-  --e2e.aws-oidc-s3-bucket-name=hypershift-ci-oidc \
-  --e2e.aws-kms-key-alias=alias/hypershift-ci \
-  --e2e.pull-secret-file=/etc/ci-pull-credentials/.dockerconfigjson \
-  --e2e.base-domain=ci.hypershift.devcluster.openshift.com \
-  --e2e.latest-release-image="${OCP_IMAGE_LATEST}" \
-  --e2e.previous-release-image="${OCP_IMAGE_PREVIOUS}" \
-  --e2e.disable-pki-reconciliation="${DISABLE_PKI_RECONCILIATION:=false}" \
-  --e2e.additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
-  --e2e.aws-endpoint-access=PublicAndPrivate \
-  --e2e.external-dns-domain=service.ci.hypershift.devcluster.openshift.com \
-  ${REQUEST_SERVING_COMPONENT_PARAMS}
-)
-
-# We would like all end-to-end testing for HyperShift to use this script, so we can set flags centrally
-# and provide the jUnit results, etc, for everyone in the same way. In order to do that, we need to allow
-# each consumer to pass disjoint sets of flags to the end-to-end binary. We already accept one argument,
-# the set of tests to run, so we will continue to honor the previous calling convention unless the caller
-# is passing more flags. That allows us to default to the current behavior and let callers opt into the
-# new paradigm over time. Once that migration is done, default_args will be removed.
-declare -a args="$@"
-if [[ "$#" -lt 2 ]]; then
-  args="${default_args[@]}"
-fi
-
-bin/test-e2e ${args} | tee /tmp/test_out &
+bin/test-e2e "$@"| tee /tmp/test_out &
 
 wait $!