From e654fa65e572f8a78970c08a76e9b77979f06927 Mon Sep 17 00:00:00 2001 From: wewang58 Date: Thu, 19 Mar 2026 14:29:30 +0800 Subject: [PATCH] Update hypershift azure e2e config and commands --- .../hypershift/openshift-hypershift-main.yaml | 21 +++++ .../openshift-hypershift-main-presubmits.yaml | 80 +++++++++++++++++++ .../hypershift-azure-run-e2e-commands.sh | 6 ++ .../run-e2e/hypershift-azure-run-e2e-ref.yaml | 4 + 4 files changed, 111 insertions(+) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml index 9d6b41bc1fd4b..2faefbb013db0 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml @@ -158,6 +158,27 @@ tests: container: from: src skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$)|(^\.coderabbit\.yaml$)|(^\.dockerignore$) +- always_run: false + as: e2e-aks-cilium + steps: + cluster_profile: hypershift-aks + dependencies: + OCP_IMAGE_N1: release:n1minor + OCP_IMAGE_N2: release:n2minor + OCP_IMAGE_N3: release:n3minor + OCP_IMAGE_N4: release:n4minor + env: + AUTH_THROUGH_CERTS: "true" + CI_TESTS_RUN: ^TestCiliumConnectivity$ + CILIUM_VERSION: 1.15.1 + ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" + EXTERNAL_CNI_PROVIDER: cilium + HYPERSHIFT_AZURE_LOCATION: centralus + HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_OFFER: "" + HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_PUBLISHER: "" + HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_SKU: "" + HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_VERSION: "" + workflow: hypershift-azure-aks-e2e - always_run: false as: e2e-aks pipeline_skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$)|(^\.coderabbit\.yaml$)|(^\.dockerignore$) diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml index 97bac86a7383f..08e3cdef54645 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml @@ -304,6 +304,86 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aks-4-21,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/e2e-aks-cilium + decorate: true + labels: + ci-operator.openshift.io/cloud: hypershift-aks + ci-operator.openshift.io/cloud-cluster-profile: hypershift-aks + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-hypershift-main-e2e-aks-cilium + rerun_command: /test e2e-aks-cilium + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aks-cilium + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )(e2e-aks-cilium|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: 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..8f1801ed5b6b7 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 @@ -103,6 +103,11 @@ if [[ -n "${HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_PUBLISHER:-}" && -n "${HYPERSHIFT MARKETPLACE_IMAGE_PARAMS="--e2e.azure-marketplace-publisher ${HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_PUBLISHER} --e2e.azure-marketplace-offer ${HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_OFFER} --e2e.azure-marketplace-sku ${HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_SKU} --e2e.azure-marketplace-version ${HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_VERSION}" fi +EXTERNAL_CNI_PROVIDER_ARGS="" +if [[ -n ${EXTERNAL_CNI_PROVIDER:-} ]]; then + EXTERNAL_CNI_PROVIDER_ARGS="--e2e.external-cni-provider=${EXTERNAL_CNI_PROVIDER} -network-type=Other" +fi + OAUTH_EXTERNAL_OIDC_PARAM="" if [ -f ${SHARED_DIR}/external-oidc-provider ] ; then source ${SHARED_DIR}/external-oidc-provider @@ -141,6 +146,7 @@ hack/ci-test-e2e.sh -test.v \ --e2e.azure-location=${HYPERSHIFT_AZURE_LOCATION} \ --e2e.oidc-issuer-url=${AZURE_OIDC_ISSUER_URL} \ --e2e.sa-token-issuer-private-key-path=${AZURE_SA_TOKEN_ISSUER_KEY_PATH} \ + ${EXTERNAL_CNI_PROVIDER_ARGS:-} \ ${EXTERNAL_DNS_ARGS:-} \ ${AKS_ANNOTATIONS:-} \ ${N1_NP_VERSION_TEST_ARGS:-} \ diff --git a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-ref.yaml b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-ref.yaml index ce2d0bab22fd9..b53ee30e92b9a 100644 --- a/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-ref.yaml +++ b/ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-ref.yaml @@ -56,6 +56,10 @@ ref: name: CI_TESTS_RUN - default: "" name: TEST_CPO_OVERRIDE + - default: "1.15.1" + name : CILIUM_VERSION + - default: "" + name: EXTERNAL_CNI_PROVIDER - default: "aro4" name: HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_OFFER - default: "azureopenshift"