Skip to content

Commit 654bbaa

Browse files
authored
telco: cnf-tests: 4.19 is branched out, master is 4.20 (#64460)
* point matser configuration to 4.20 * create 4.19 configuration * update image mirroring urls * run `make jobs` and `make ci-operator-config` Signed-off-by: Shereen Haj <[email protected]>
1 parent aab35c7 commit 654bbaa

7 files changed

+849
-26
lines changed

ci-operator/config/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
base_images:
22
base-9:
3-
name: "4.19"
3+
name: "4.20"
44
namespace: ocp
55
tag: base-rhel9
6-
ocp_4.19_oc-rpms:
7-
name: "4.19"
6+
ocp_4.20_oc-rpms:
7+
name: "4.20"
88
namespace: ocp
99
tag: oc-rpms
10-
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
10+
ocp_builder_rhel-9-golang-1.23-openshift-4.20:
1111
name: builder
1212
namespace: ocp
13-
tag: rhel-9-golang-1.23-openshift-4.19
13+
tag: rhel-9-golang-1.23-openshift-4.20
1414
os-min8:
1515
name: ubi-minimal
1616
namespace: ocp
@@ -24,12 +24,12 @@ images:
2424
dockerfile_path: cnf-tests/Dockerfile.openshift
2525
from: base-9
2626
inputs:
27-
ocp_4.19_oc-rpms:
27+
ocp_4.20_oc-rpms:
2828
as:
29-
- registry.ci.openshift.org/ocp/4.19:oc-rpms
30-
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
29+
- registry.ci.openshift.org/ocp/4.20:oc-rpms
30+
ocp_builder_rhel-9-golang-1.23-openshift-4.20:
3131
as:
32-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
32+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20
3333
to: cnf-tests
3434
- context_dir: tools/s2i-dpdk/
3535
dockerfile_path: Dockerfile
@@ -41,18 +41,18 @@ images:
4141
to: ztp-site-generator
4242
promotion:
4343
to:
44-
- name: "4.19"
44+
- name: "4.20"
4545
namespace: ocp-kni
4646
releases:
4747
initial:
4848
integration:
49-
name: "4.19"
49+
name: "4.20"
5050
namespace: ocp
5151
latest:
5252
candidate:
5353
product: ocp
5454
stream: ci
55-
version: "4.19"
55+
version: "4.20"
5656
resources:
5757
'*':
5858
requests:
@@ -87,7 +87,7 @@ tests:
8787
ci-org-name openshift-kni
8888
test:
8989
- as: e2e-aws-ci-tests
90-
commands: FEATURES_ENVIRONMENT=ci IPERF3_BITRATE_OVERRIDE="300000000" TARGET_RELEASE=release-4.19
90+
commands: FEATURES_ENVIRONMENT=ci IPERF3_BITRATE_OVERRIDE="300000000" TARGET_RELEASE=release-4.20
9191
make functests-on-ci
9292
from: src
9393
resources:
@@ -141,7 +141,7 @@ tests:
141141
CNF_E2E_TESTS=true
142142
CNF_ORIGIN_TESTS=false
143143
T5CI_JOB_TYPE: cnftests
144-
T5CI_VERSION: "4.19"
144+
T5CI_VERSION: "4.20"
145145
workflow: telco5g-cnf
146146
timeout: 6h0m0s
147147
- as: e2e-telco5g-hcp-cnftests
@@ -155,7 +155,7 @@ tests:
155155
CNF_E2E_TESTS=true
156156
CNF_ORIGIN_TESTS=false
157157
T5CI_JOB_TYPE: hcp-cnftests
158-
T5CI_VERSION: "4.19"
158+
T5CI_VERSION: "4.20"
159159
workflow: telco5g-hcp-cnf
160160
zz_generated_metadata:
161161
branch: master
Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
base_images:
2+
base-9:
3+
name: "4.19"
4+
namespace: ocp
5+
tag: base-rhel9
6+
ocp_4.19_oc-rpms:
7+
name: "4.19"
8+
namespace: ocp
9+
tag: oc-rpms
10+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
11+
name: builder
12+
namespace: ocp
13+
tag: rhel-9-golang-1.23-openshift-4.19
14+
os-min8:
15+
name: ubi-minimal
16+
namespace: ocp
17+
tag: "8"
18+
binary_build_commands: make build
19+
build_root:
20+
project_image:
21+
dockerfile_path: openshift-ci/Dockerfile.tools
22+
images:
23+
- context_dir: .
24+
dockerfile_path: cnf-tests/Dockerfile.openshift
25+
from: base-9
26+
inputs:
27+
ocp_4.19_oc-rpms:
28+
as:
29+
- registry.ci.openshift.org/ocp/4.19:oc-rpms
30+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
31+
as:
32+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
33+
to: cnf-tests
34+
- context_dir: tools/s2i-dpdk/
35+
dockerfile_path: Dockerfile
36+
from: base-9
37+
to: dpdk
38+
- context_dir: .
39+
dockerfile_path: ztp/resource-generator/Containerfile
40+
from: os-min8
41+
to: ztp-site-generator
42+
promotion:
43+
to:
44+
- name: "4.19"
45+
namespace: ocp-kni
46+
releases:
47+
initial:
48+
integration:
49+
name: "4.19"
50+
namespace: ocp
51+
latest:
52+
candidate:
53+
product: ocp
54+
stream: ci
55+
version: "4.19"
56+
resources:
57+
'*':
58+
requests:
59+
cpu: 100m
60+
memory: 200Mi
61+
tests:
62+
- always_run: false
63+
as: ci
64+
commands: make ci-job
65+
container:
66+
from: src
67+
skip_if_only_changed: \.tekton/.*
68+
- as: ztp-ci
69+
commands: make ztp-ci-job
70+
container:
71+
from: src
72+
run_if_changed: ^ztp
73+
- always_run: false
74+
as: e2e-aws-ci-tests
75+
skip_if_only_changed: ^ztp|\.tekton/.*
76+
steps:
77+
cluster_profile: aws-telco
78+
env:
79+
BASE_DOMAIN: telco5g-ci.devcluster.openshift.com
80+
SPOT_INSTANCES: "true"
81+
USER_TAGS: |
82+
ci-job-source prowci
83+
ci-job-branch master
84+
ci-job-fullname openshift-kni-cnf-features-deploy-e2e-aws-ci-tests-master
85+
ci-job-type e2e-aws-ci-tests
86+
ci-repo-name cnf-features-deploy
87+
ci-org-name openshift-kni
88+
test:
89+
- as: e2e-aws-ci-tests
90+
commands: FEATURES_ENVIRONMENT=ci IPERF3_BITRATE_OVERRIDE="300000000" TARGET_RELEASE=release-4.19
91+
make functests-on-ci
92+
from: src
93+
resources:
94+
requests:
95+
cpu: 100m
96+
memory: 200Mi
97+
timeout: 4h0m0s
98+
workflow: openshift-e2e-aws-ovn
99+
- as: e2e-aws-ran-profile
100+
optional: true
101+
steps:
102+
cluster_profile: aws-telco
103+
env:
104+
BASE_DOMAIN: telco5g-ci.devcluster.openshift.com
105+
SPOT_INSTANCES: "true"
106+
USER_TAGS: |
107+
ci-job-source prowci
108+
ci-job-branch master
109+
ci-job-fullname openshift-kni-cnf-features-deploy-e2e-aws-ran-profile-master
110+
ci-job-type e2e-aws-ran-profile
111+
ci-repo-name cnf-features-deploy
112+
ci-org-name openshift-kni
113+
test:
114+
- as: e2e-aws-ran-profile
115+
commands: FEATURES_ENVIRONMENT=cn-ran-overlays FEATURES=ran-profile-gcp SKIP_TESTS="xt_u32
116+
container-mount-namespace gatekeeper n3000 fec metallb sro multinetworkpolicy
117+
knmstate" make validate-on-ci
118+
from: src
119+
resources:
120+
requests:
121+
cpu: 100m
122+
memory: 200Mi
123+
workflow: openshift-e2e-aws-ovn
124+
- always_run: false
125+
as: security
126+
optional: true
127+
skip_if_only_changed: \.tekton/.*|^test/|^hack/|^scripts/|^bin/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|LICENSE)$
128+
steps:
129+
env:
130+
PROJECT_NAME: cnf-features-deploy
131+
SNYK_CODE_ADDITIONAL_ARGS: --severity-threshold=high --policy-path=.snyk
132+
workflow: openshift-ci-security
133+
- as: e2e-telco5g-cnftests
134+
cluster: build05
135+
optional: true
136+
restrict_network_access: false
137+
steps:
138+
env:
139+
E2E_TESTS_CONFIG: |
140+
CNF_E2E_TESTS=true
141+
CNF_ORIGIN_TESTS=false
142+
T5CI_JOB_TYPE: cnftests
143+
T5CI_VERSION: "4.19"
144+
workflow: telco5g-cnf
145+
timeout: 6h0m0s
146+
- as: e2e-telco5g-sno-cnftests
147+
cluster: build05
148+
optional: true
149+
restrict_network_access: false
150+
steps:
151+
env:
152+
E2E_TESTS_CONFIG: |
153+
CNF_E2E_TESTS=true
154+
CNF_ORIGIN_TESTS=false
155+
T5CI_JOB_TYPE: sno-cnftests
156+
T5CI_VERSION: "4.19"
157+
workflow: telco5g-sno-cnf
158+
- as: e2e-telco5g-hcp-cnftests
159+
cluster: build05
160+
optional: true
161+
restrict_network_access: false
162+
steps:
163+
env:
164+
E2E_TESTS_CONFIG: |
165+
CNF_E2E_TESTS=true
166+
CNF_ORIGIN_TESTS=false
167+
T5CI_JOB_TYPE: hcp-cnftests
168+
T5CI_VERSION: "4.19"
169+
workflow: telco5g-hcp-cnf
170+
zz_generated_metadata:
171+
branch: release-4.19
172+
org: openshift-kni
173+
repo: cnf-features-deploy

ci-operator/jobs/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master-postsubmits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ postsubmits:
1111
labels:
1212
ci-operator.openshift.io/is-promotion: "true"
1313
ci.openshift.io/generator: prowgen
14-
job-release: "4.19"
14+
job-release: "4.20"
1515
max_concurrency: 1
1616
name: branch-ci-openshift-kni-cnf-features-deploy-master-images
1717
spec:

ci-operator/jobs/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master-presubmits.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ presubmits:
1212
skip_cloning: true
1313
labels:
1414
ci.openshift.io/generator: prowgen
15-
job-release: "4.19"
15+
job-release: "4.20"
1616
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1717
name: pull-ci-openshift-kni-cnf-features-deploy-master-ci
1818
rerun_command: /test ci
@@ -71,7 +71,7 @@ presubmits:
7171
ci-operator.openshift.io/cloud: aws
7272
ci-operator.openshift.io/cloud-cluster-profile: aws-telco
7373
ci.openshift.io/generator: prowgen
74-
job-release: "4.19"
74+
job-release: "4.20"
7575
pj-rehearse.openshift.io/can-be-rehearsed: "true"
7676
name: pull-ci-openshift-kni-cnf-features-deploy-master-e2e-aws-ci-tests
7777
rerun_command: /test e2e-aws-ci-tests
@@ -147,7 +147,7 @@ presubmits:
147147
ci-operator.openshift.io/cloud: aws
148148
ci-operator.openshift.io/cloud-cluster-profile: aws-telco
149149
ci.openshift.io/generator: prowgen
150-
job-release: "4.19"
150+
job-release: "4.20"
151151
pj-rehearse.openshift.io/can-be-rehearsed: "true"
152152
name: pull-ci-openshift-kni-cnf-features-deploy-master-e2e-aws-ran-profile
153153
optional: true
@@ -223,7 +223,7 @@ presubmits:
223223
labels:
224224
capability/intranet: intranet
225225
ci.openshift.io/generator: prowgen
226-
job-release: "4.19"
226+
job-release: "4.20"
227227
pj-rehearse.openshift.io/can-be-rehearsed: "true"
228228
name: pull-ci-openshift-kni-cnf-features-deploy-master-e2e-telco5g-cnftests
229229
optional: true
@@ -288,7 +288,7 @@ presubmits:
288288
labels:
289289
capability/intranet: intranet
290290
ci.openshift.io/generator: prowgen
291-
job-release: "4.19"
291+
job-release: "4.20"
292292
pj-rehearse.openshift.io/can-be-rehearsed: "true"
293293
name: pull-ci-openshift-kni-cnf-features-deploy-master-e2e-telco5g-hcp-cnftests
294294
optional: true
@@ -352,7 +352,7 @@ presubmits:
352352
skip_cloning: true
353353
labels:
354354
ci.openshift.io/generator: prowgen
355-
job-release: "4.19"
355+
job-release: "4.20"
356356
pj-rehearse.openshift.io/can-be-rehearsed: "true"
357357
name: pull-ci-openshift-kni-cnf-features-deploy-master-images
358358
rerun_command: /test images
@@ -409,7 +409,7 @@ presubmits:
409409
skip_cloning: true
410410
labels:
411411
ci.openshift.io/generator: prowgen
412-
job-release: "4.19"
412+
job-release: "4.20"
413413
pj-rehearse.openshift.io/can-be-rehearsed: "true"
414414
name: pull-ci-openshift-kni-cnf-features-deploy-master-security
415415
optional: true
@@ -474,7 +474,7 @@ presubmits:
474474
skip_cloning: true
475475
labels:
476476
ci.openshift.io/generator: prowgen
477-
job-release: "4.19"
477+
job-release: "4.20"
478478
pj-rehearse.openshift.io/can-be-rehearsed: "true"
479479
name: pull-ci-openshift-kni-cnf-features-deploy-master-ztp-ci
480480
rerun_command: /test ztp-ci

0 commit comments

Comments
 (0)