Skip to content

CNTRLPLANE-1137:Add cilium e2e ci #75520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 20, 2026
Merged

CNTRLPLANE-1137:Add cilium e2e ci #75520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$)
Expand Down
80 changes: 80 additions & 0 deletions ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:-} \
Expand Down
4 changes: 4 additions & 0 deletions ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down