From 5f76fbd48432b12d43f3f03a2178522e20a8325a Mon Sep 17 00:00:00 2001 From: wen wang Date: Mon, 22 Dec 2025 09:35:41 +0800 Subject: [PATCH 1/3] Fix conflict --- .../hypershift-azure-run-e2e-commands.sh | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh index bf9e790157296..30c75f91f7ef6 100644 --- a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh +++ b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh @@ -131,7 +131,22 @@ if [[ "${OAUTH_EXTERNAL_OIDC_PROVIDER}" != "" ]]; then esac fi -hack/ci-test-e2e.sh -test.v \ +CI_TESTS_RUN="TestCiliumConnectivity" +#AZURE_NETWORK_TYPE="OVNKubernetes" +#if [[ "${CI_TESTS_RUN:-}" == "TestCiliumConnectivity" ]];then +AZURE_NETWORK_TYPE="--network-type=Other" + +export CILIUM_VERSION="1.14.5" + +rm -rf /tmp/test-e2e +oc image extract quay.io/wewang58/test-e2e:cilium --confirm --path /:/tmp/ +sleep 10m + +cp hack/ci-test-e2e.sh /tmp/ +sed -i 's|bin/test-e2e|/tmp/test-e2e|g' /tmp/ci-test-e2e.sh +chmod +x /tmp/test-e2e + +/tmp/ci-test-e2e.sh -test.v \ -test.run=${CI_TESTS_RUN:-} \ -test.parallel=20 \ --e2e.platform=Azure \ @@ -150,10 +165,12 @@ hack/ci-test-e2e.sh -test.v \ ${MI_ARGS:-} \ ${DP_ARGS:-} \ ${AZURE_MULTI_ARCH_PARAMS:-} \ + ${AZURE_NETWORK_TYPE:-} \ --e2e.azure-encryption-key-id=${AKS_KMS_KEY} \ --e2e.azure-kms-credentials-secret-name=${AKS_KMS_CREDENTIALS_SECRET} \ ${MARKETPLACE_IMAGE_PARAMS} \ --e2e.latest-release-image="${OCP_IMAGE_LATEST}" \ ${OAUTH_EXTERNAL_OIDC_PARAM:-} \ - --e2e.previous-release-image="${OCP_IMAGE_PREVIOUS}" & + --e2e.previous-release-image="${OCP_IMAGE_PREVIOUS}" \ + --e2e.external-cni-provider="cilium" & wait $! \ No newline at end of file From 7dabe82bcef1a1448296c99117167d79c922eff4 Mon Sep 17 00:00:00 2001 From: wewang58 Date: Tue, 3 Mar 2026 12:31:57 +0800 Subject: [PATCH 2/3] run all --- .../azure/run-e2e/hypershift-azure-run-e2e-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh index 30c75f91f7ef6..f7113ad6501f0 100644 --- a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh +++ b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh @@ -131,7 +131,7 @@ if [[ "${OAUTH_EXTERNAL_OIDC_PROVIDER}" != "" ]]; then esac fi -CI_TESTS_RUN="TestCiliumConnectivity" +#CI_TESTS_RUN="TestCiliumConnectivity" #AZURE_NETWORK_TYPE="OVNKubernetes" #if [[ "${CI_TESTS_RUN:-}" == "TestCiliumConnectivity" ]];then AZURE_NETWORK_TYPE="--network-type=Other" From ac52164e89dbc8b16b717e728713a66bffc25a1e Mon Sep 17 00:00:00 2001 From: wewang58 Date: Fri, 6 Mar 2026 09:21:07 +0800 Subject: [PATCH 3/3] update --- .../azure/run-e2e/hypershift-azure-run-e2e-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh index f7113ad6501f0..f62445336fe9f 100644 --- a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh +++ b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh @@ -136,7 +136,7 @@ fi #if [[ "${CI_TESTS_RUN:-}" == "TestCiliumConnectivity" ]];then AZURE_NETWORK_TYPE="--network-type=Other" -export CILIUM_VERSION="1.14.5" +export CILIUM_VERSION="1.15.1" rm -rf /tmp/test-e2e oc image extract quay.io/wewang58/test-e2e:cilium --confirm --path /:/tmp/ @@ -173,4 +173,4 @@ chmod +x /tmp/test-e2e ${OAUTH_EXTERNAL_OIDC_PARAM:-} \ --e2e.previous-release-image="${OCP_IMAGE_PREVIOUS}" \ --e2e.external-cni-provider="cilium" & -wait $! \ No newline at end of file +wait $!