Skip to content

Commit d0fa40e

Browse files
committed
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).
1 parent ab6ae8f commit d0fa40e

3 files changed

Lines changed: 164 additions & 0 deletions

File tree

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
build_root:
2+
image_stream_tag:
3+
name: eco-ci-cd
4+
namespace: telcov10n-ci
5+
tag: eco-ci-cd
6+
releases:
7+
latest:
8+
candidate:
9+
product: ocp
10+
stream: nightly
11+
version: "4.18"
12+
resources:
13+
'*':
14+
limits:
15+
memory: 4Gi
16+
requests:
17+
cpu: 100m
18+
memory: 200Mi
19+
tests:
20+
- as: cnf-ran-ztp-tests
21+
capabilities:
22+
- intranet
23+
cron: 0 0 31 2 *
24+
steps:
25+
env:
26+
CLUSTER_NAME: kni-qe-106
27+
CNF_GOTESTS_FEATURES: reboot
28+
DISABLE_INSIGHTS: "true"
29+
DISCONNECTED: "true"
30+
DOWNSTREAM_TEST_REPO: https://gitlab.cee.redhat.com/cnf/cnf-gotests/
31+
ECO_GOTESTS_FEATURES: gitopsztp deploymenttypes
32+
HUB_CLUSTER: kni-qe-106
33+
HUB_OPERATORS: |
34+
[
35+
{"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"}},
36+
{"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":[]}},
37+
{"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"]}},
38+
{"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":{}},
39+
{"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"},
40+
{"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":[]}}
41+
]
42+
JOB_NAME: periodic-ci-openshift-kni-eco-ci-cd-main-cnf-ran-sno-day2-worker-4.18-cnf-ran-ztp-tests
43+
JOB_TYPE: "1"
44+
MIRROR_REGISTRY: disconnected.registry.local:5000
45+
RAN_METRICS_LIST: spoke_general_ocp,hub_general_ocp,sriov,sriov_fec,ptp,acm,talm,gitops,local_storage,logging
46+
REPORTER_TEMPLATE_NAME: Telco 5G RAN Regression 4_18 - Telco 5G RAN Regression
47+
- <build> - 4.18
48+
REPORTPORTAL_FILES: .reportportal_url_Sno_Day2_Worker
49+
REPORTS_PORTAL_ATTRIBUTES_ENV: ci-lane:telco-ft-ran-sno-day2-worker;spoke_ocp_version:4.18
50+
SPOKE_CLUSTER: '[''kni-qe-107'']'
51+
SPOKE_OPERATORS: |
52+
[
53+
{"name":"sriov-fec","catalog":"certified-operators","nsname":"vran-acceleration-operators","channel":"stable"},
54+
{"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"}},
55+
{"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"},
56+
{"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":[]}},
57+
{"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"}}
58+
]
59+
VERSION: "4.18"
60+
ZTP_GIT_BRANCH: sno_day2_worker
61+
ZTP_GIT_BRANCH_DAY2_WORKER: sno_day2_worker_add_worker
62+
ZTP_GIT_REPO: https://gitlab.cee.redhat.com/rdiscala/ztp-site-configs-ci.git
63+
post:
64+
- ref: telcov10n-functional-cnf-ran-report-compact
65+
- ref: telcov10n-functional-cnf-ran-send-slack-notification
66+
- ref: telcov10n-functional-cnf-network-trigger-job
67+
- ref: telcov10n-verify-junit-reports
68+
pre:
69+
- ref: telcov10n-functional-cnf-ran-hub-deploy
70+
- ref: telcov10n-functional-cnf-ran-hub-config
71+
- ref: telcov10n-functional-cnf-ran-mirror-spoke-operators
72+
- ref: telcov10n-functional-cnf-ran-deploy-spoke-sno
73+
- ref: telcov10n-functional-cnf-ran-deploy-spoke-sno-day2-worker
74+
test:
75+
- ref: telcov10n-functional-cnf-ran-cnf-gotests-sno-worker
76+
- ref: telcov10n-functional-cnf-ran-eco-gotests-sno-worker
77+
zz_generated_metadata:
78+
branch: main
79+
org: openshift-kni
80+
repo: eco-ci-cd
81+
variant: cnf-ran-sno-day2-worker-4.18

ci-operator/jobs/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main-periodics.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2920,6 +2920,88 @@ periodics:
29202920
- name: result-aggregator
29212921
secret:
29222922
secretName: result-aggregator
2923+
- agent: kubernetes
2924+
cluster: build07
2925+
cron: 0 0 31 2 *
2926+
decorate: true
2927+
decoration_config:
2928+
skip_cloning: true
2929+
extra_refs:
2930+
- base_ref: main
2931+
org: openshift-kni
2932+
repo: eco-ci-cd
2933+
labels:
2934+
capability/intranet: intranet
2935+
ci-operator.openshift.io/variant: cnf-ran-sno-day2-worker-4.18
2936+
ci.openshift.io/generator: prowgen
2937+
job-release: "4.18"
2938+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2939+
name: periodic-ci-openshift-kni-eco-ci-cd-main-cnf-ran-sno-day2-worker-4.18-cnf-ran-ztp-tests
2940+
spec:
2941+
containers:
2942+
- args:
2943+
- --gcs-upload-secret=/secrets/gcs/service-account.json
2944+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2945+
- --lease-server-credentials-file=/etc/boskos/credentials
2946+
- --report-credentials-file=/etc/report/credentials
2947+
- --secret-dir=/secrets/ci-pull-credentials
2948+
- --target=cnf-ran-ztp-tests
2949+
- --variant=cnf-ran-sno-day2-worker-4.18
2950+
command:
2951+
- ci-operator
2952+
env:
2953+
- name: HTTP_SERVER_IP
2954+
valueFrom:
2955+
fieldRef:
2956+
fieldPath: status.podIP
2957+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
2958+
imagePullPolicy: Always
2959+
name: ""
2960+
ports:
2961+
- containerPort: 8080
2962+
name: http
2963+
resources:
2964+
requests:
2965+
cpu: 10m
2966+
volumeMounts:
2967+
- mountPath: /etc/boskos
2968+
name: boskos
2969+
readOnly: true
2970+
- mountPath: /secrets/ci-pull-credentials
2971+
name: ci-pull-credentials
2972+
readOnly: true
2973+
- mountPath: /secrets/gcs
2974+
name: gcs-credentials
2975+
readOnly: true
2976+
- mountPath: /secrets/manifest-tool
2977+
name: manifest-tool-local-pusher
2978+
readOnly: true
2979+
- mountPath: /etc/pull-secret
2980+
name: pull-secret
2981+
readOnly: true
2982+
- mountPath: /etc/report
2983+
name: result-aggregator
2984+
readOnly: true
2985+
serviceAccountName: ci-operator
2986+
volumes:
2987+
- name: boskos
2988+
secret:
2989+
items:
2990+
- key: credentials
2991+
path: credentials
2992+
secretName: boskos-credentials
2993+
- name: ci-pull-credentials
2994+
secret:
2995+
secretName: ci-pull-credentials
2996+
- name: manifest-tool-local-pusher
2997+
secret:
2998+
secretName: manifest-tool-local-pusher
2999+
- name: pull-secret
3000+
secret:
3001+
secretName: registry-pull-credentials
3002+
- name: result-aggregator
3003+
secret:
3004+
secretName: result-aggregator
29233005
- agent: kubernetes
29243006
cluster: build07
29253007
cron: 0 0 31 2 *

ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ if [ "${DISABLE_INSIGHTS}" = "true" ]; then
7272
EXTRA_VARS="${EXTRA_VARS} disable_insights=true"
7373
fi
7474

75+
ANSIBLE_JINJA2_NATIVE=true \
7576
ansible-playbook ./playbooks/deploy-ocp-sno.yml \
7677
-i ./inventories/ocp-deployment/build-inventory.py \
7778
--extra-vars "${EXTRA_VARS}"

0 commit comments

Comments
 (0)