From d0fa40ee47c54b0dee9ed36916c0060ef8fb00ca Mon Sep 17 00:00:00 2001 From: Rigel Di Scala Date: Fri, 15 May 2026 20:40:27 +0200 Subject: [PATCH] Add ci-operator config for SNO day2-worker 4.18 CI lane Adapts the existing 4.20 sno-day2-worker variant to OpenShift 4.18, using the same infrastructure (kni-qe-106 hub, kni-qe-107 spoke) with 4.18-compatible operator channels (ACM release-2.13, MCE stable-2.8, TALM fbc-4-18, cluster-logging stable-6.1). --- ...cd-main__cnf-ran-sno-day2-worker-4.18.yaml | 81 ++++++++++++++++++ ...penshift-kni-eco-ci-cd-main-periodics.yaml | 82 +++++++++++++++++++ ...-functional-cnf-ran-hub-deploy-commands.sh | 1 + 3 files changed, 164 insertions(+) create mode 100644 ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-sno-day2-worker-4.18.yaml diff --git a/ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-sno-day2-worker-4.18.yaml b/ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-sno-day2-worker-4.18.yaml new file mode 100644 index 0000000000000..facc866bfe870 --- /dev/null +++ b/ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-sno-day2-worker-4.18.yaml @@ -0,0 +1,81 @@ +build_root: + image_stream_tag: + name: eco-ci-cd + namespace: telcov10n-ci + tag: eco-ci-cd +releases: + latest: + candidate: + product: ocp + stream: nightly + version: "4.18" +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: cnf-ran-ztp-tests + capabilities: + - intranet + cron: 0 0 31 2 * + steps: + env: + CLUSTER_NAME: kni-qe-106 + CNF_GOTESTS_FEATURES: reboot + DISABLE_INSIGHTS: "true" + DISCONNECTED: "true" + DOWNSTREAM_TEST_REPO: https://gitlab.cee.redhat.com/cnf/cnf-gotests/ + ECO_GOTESTS_FEATURES: gitopsztp deploymenttypes + HUB_CLUSTER: kni-qe-106 + HUB_OPERATORS: | + [ + {"name":"local-storage-operator","catalog":"redhat-operators","nsname":"openshift-local-storage","channel":"stable","og_name":"local-operator-group","subscription_name":"local-storage-operator","deploy_default_config":false,"ns_annotations":{"workload.openshift.io/allowed":"management"}}, + {"name":"openshift-gitops-operator","catalog":"redhat-operators","nsname":"openshift-gitops-operator","channel":"latest","og_name":"openshift-gitops-operator","subscription_name":"openshift-gitops-operator","deploy_default_config":false,"og_spec":{"targetNamespaces":[]}}, + {"name":"advanced-cluster-management","catalog":"redhat-operators","nsname":"open-cluster-management","channel":"release-2.13","default_channel":"release-2.16","og_name":"open-cluster-management","subscription_name":"acm-operator-subscription","deploy_default_config":false,"og_spec":{"targetNamespaces":["open-cluster-management"]}}, + {"name":"multicluster-engine","catalog":"redhat-operators","nsname":"multicluster-engine","channel":"stable-2.8","default_channel":"stable-2.11","og_name":"multicluster-engine","subscription_name":"multicluster-engine","deploy_default_config":true,"og_spec":{}}, + {"name":"topology-aware-lifecycle-manager","catalog":"topology-aware-lifecycle-manager-fbc","og_name":"global-operators","nsname":"openshift-operators","fbc_iib_repo":"latest","channel":"stable","deploy_default_config":false,"ocp_operator_mirror_fbc_image_base":"quay.io/redhat-user-workloads/telco-5g-tenant/topology-aware-lifecycle-manager-fbc-4-18"}, + {"name":"cluster-logging","catalog":"redhat-operators","nsname":"openshift-logging","channel":"stable-6.1","default_channel":"stable-6.4","og_name":"cluster-logging","subscription_name":"cluster-logging","og_spec":{"targetNamespaces":[]}} + ] + JOB_NAME: periodic-ci-openshift-kni-eco-ci-cd-main-cnf-ran-sno-day2-worker-4.18-cnf-ran-ztp-tests + JOB_TYPE: "1" + MIRROR_REGISTRY: disconnected.registry.local:5000 + RAN_METRICS_LIST: spoke_general_ocp,hub_general_ocp,sriov,sriov_fec,ptp,acm,talm,gitops,local_storage,logging + REPORTER_TEMPLATE_NAME: Telco 5G RAN Regression 4_18 - Telco 5G RAN Regression + - - 4.18 + REPORTPORTAL_FILES: .reportportal_url_Sno_Day2_Worker + REPORTS_PORTAL_ATTRIBUTES_ENV: ci-lane:telco-ft-ran-sno-day2-worker;spoke_ocp_version:4.18 + SPOKE_CLUSTER: '[''kni-qe-107'']' + SPOKE_OPERATORS: | + [ + {"name":"sriov-fec","catalog":"certified-operators","nsname":"vran-acceleration-operators","channel":"stable"}, + {"name":"ptp-operator","catalog":"redhat-operators-ptp-art","fbc_iib_repo":"ose-ptp-rhel9-operator","nsname":"openshift-ptp","channel":"stable","ns_labels":{"workload.openshift.io/allowed":"management","name":"openshift-ptp"}}, + {"name":"sriov-network-operator","catalog":"redhat-operators-sriov-art","fbc_iib_repo":"ose-sriov-network-rhel9-operator","nsname":"openshift-sriov-network-operator","channel":"stable","og_name":"sriov-network-operators","subscription_name":"sriov-network-operator-subscription"}, + {"name":"cluster-logging","catalog":"redhat-operators","nsname":"openshift-logging","channel":"stable-6.1","default_channel":"stable-6.4","og_name":"cluster-logging","subscription_name":"cluster-logging","og_spec":{"targetNamespaces":[]}}, + {"name":"local-storage-operator","fbc_iib_repo":"ose-local-storage-rhel9-operator","catalog":"redhat-operators-storage-art","nsname":"openshift-local-storage","channel":"stable","og_name":"local-operator-group","subscription_name":"local-storage-operator","deploy_default_config":false,"ns_labels":{"workload.openshift.io/allowed":"management"}} + ] + VERSION: "4.18" + ZTP_GIT_BRANCH: sno_day2_worker + ZTP_GIT_BRANCH_DAY2_WORKER: sno_day2_worker_add_worker + ZTP_GIT_REPO: https://gitlab.cee.redhat.com/rdiscala/ztp-site-configs-ci.git + post: + - ref: telcov10n-functional-cnf-ran-report-compact + - ref: telcov10n-functional-cnf-ran-send-slack-notification + - ref: telcov10n-functional-cnf-network-trigger-job + - ref: telcov10n-verify-junit-reports + pre: + - ref: telcov10n-functional-cnf-ran-hub-deploy + - ref: telcov10n-functional-cnf-ran-hub-config + - ref: telcov10n-functional-cnf-ran-mirror-spoke-operators + - ref: telcov10n-functional-cnf-ran-deploy-spoke-sno + - ref: telcov10n-functional-cnf-ran-deploy-spoke-sno-day2-worker + test: + - ref: telcov10n-functional-cnf-ran-cnf-gotests-sno-worker + - ref: telcov10n-functional-cnf-ran-eco-gotests-sno-worker +zz_generated_metadata: + branch: main + org: openshift-kni + repo: eco-ci-cd + variant: cnf-ran-sno-day2-worker-4.18 diff --git a/ci-operator/jobs/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main-periodics.yaml b/ci-operator/jobs/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main-periodics.yaml index cb5c5923dde72..c27c0db63acb8 100644 --- a/ci-operator/jobs/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main-periodics.yaml +++ b/ci-operator/jobs/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main-periodics.yaml @@ -2920,6 +2920,88 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build07 + cron: 0 0 31 2 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-kni + repo: eco-ci-cd + labels: + capability/intranet: intranet + ci-operator.openshift.io/variant: cnf-ran-sno-day2-worker-4.18 + ci.openshift.io/generator: prowgen + job-release: "4.18" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-kni-eco-ci-cd-main-cnf-ran-sno-day2-worker-4.18-cnf-ran-ztp-tests + 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=cnf-ran-ztp-tests + - --variant=cnf-ran-sno-day2-worker-4.18 + 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 - agent: kubernetes cluster: build07 cron: 0 0 31 2 * diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh index bfd65cc1c2bf2..b6885105fb2e5 100644 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh @@ -72,6 +72,7 @@ if [ "${DISABLE_INSIGHTS}" = "true" ]; then EXTRA_VARS="${EXTRA_VARS} disable_insights=true" fi +ANSIBLE_JINJA2_NATIVE=true \ ansible-playbook ./playbooks/deploy-ocp-sno.yml \ -i ./inventories/ocp-deployment/build-inventory.py \ --extra-vars "${EXTRA_VARS}"