Skip to content

Commit c76f97a

Browse files
shajmakhkrishvoor
shajmakh
authored and
krishvoor
committed
kni: scheduler-plugin: branch out 4.18 and point main to 4.19 (openshift#59695)
Create 4.18 relevant config and jobs and redirect main to 4.19. Signed-off-by: Shereen Haj <[email protected]>
1 parent 54346fd commit c76f97a

File tree

5 files changed

+293
-3
lines changed

5 files changed

+293
-3
lines changed

‎ci-operator/config/openshift-kni/scheduler-plugins/openshift-kni-scheduler-plugins-master.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ promotion:
2323
releases:
2424
initial:
2525
integration:
26-
name: "4.18"
26+
name: "4.19"
2727
namespace: ocp
2828
latest:
2929
integration:
3030
include_built_images: true
31-
name: "4.18"
31+
name: "4.19"
3232
namespace: ocp
3333
resources:
3434
'*':

‎ci-operator/config/openshift-kni/scheduler-plugins/openshift-kni-scheduler-plugins-release-4.18.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
base_images:
2+
os-min9:
3+
name: ubi-minimal
4+
namespace: ocp
5+
tag: "9"
6+
binary_build_commands: make -f Makefile.kni build-noderesourcetopology-plugin
7+
build_root:
8+
project_image:
9+
dockerfile_path: build/noderesourcetopology-plugin/Dockerfile.tools
10+
images:
11+
- dockerfile_path: build/noderesourcetopology-plugin/Dockerfile.openshift
12+
from: os-min9
13+
inputs:
14+
bin:
15+
paths:
16+
- destination_dir: .
17+
source_path: /go/src/github.com/openshift-kni/scheduler-plugins/bin/noderesourcetopology-plugin
18+
to: scheduler-plugins
19+
promotion:
20+
to:
21+
- name: scheduler-plugins-4.18
22+
namespace: ocp-kni
23+
releases:
24+
initial:
25+
integration:
26+
name: "4.18"
27+
namespace: ocp
28+
latest:
29+
integration:
30+
include_built_images: true
31+
name: "4.18"
32+
namespace: ocp
33+
resources:
34+
'*':
35+
requests:
36+
cpu: 100m
37+
memory: 200Mi
38+
tests:
39+
- as: ci-unit
40+
commands: make -f Makefile.kni unit-test-quick
41+
container:
42+
from: src
43+
- as: security
44+
optional: true
45+
steps:
46+
env:
47+
PROJECT_NAME: noderesourcetopology-scheduler
48+
workflow: openshift-ci-security
49+
zz_generated_metadata:
50+
branch: release-4.18
51+
org: openshift-kni
52+
repo: scheduler-plugins

‎ci-operator/jobs/openshift-kni/scheduler-plugins/openshift-kni-scheduler-plugins-release-4.18-postsubmits.yaml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
postsubmits:
2+
openshift-kni/scheduler-plugins:
3+
- agent: kubernetes
4+
always_run: true
5+
branches:
6+
- ^release-4\.18$
7+
cluster: build03
8+
decorate: true
9+
decoration_config:
10+
skip_cloning: true
11+
labels:
12+
ci-operator.openshift.io/is-promotion: "true"
13+
ci.openshift.io/generator: prowgen
14+
max_concurrency: 1
15+
name: branch-ci-openshift-kni-scheduler-plugins-release-4.18-images
16+
spec:
17+
containers:
18+
- args:
19+
- --gcs-upload-secret=/secrets/gcs/service-account.json
20+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
21+
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
22+
- --promote
23+
- --report-credentials-file=/etc/report/credentials
24+
- --target=[images]
25+
command:
26+
- ci-operator
27+
image: ci-operator:latest
28+
imagePullPolicy: Always
29+
name: ""
30+
resources:
31+
requests:
32+
cpu: 10m
33+
volumeMounts:
34+
- mountPath: /secrets/gcs
35+
name: gcs-credentials
36+
readOnly: true
37+
- mountPath: /secrets/manifest-tool
38+
name: manifest-tool-local-pusher
39+
readOnly: true
40+
- mountPath: /etc/pull-secret
41+
name: pull-secret
42+
readOnly: true
43+
- mountPath: /etc/push-secret
44+
name: push-secret
45+
readOnly: true
46+
- mountPath: /etc/report
47+
name: result-aggregator
48+
readOnly: true
49+
serviceAccountName: ci-operator
50+
volumes:
51+
- name: manifest-tool-local-pusher
52+
secret:
53+
secretName: manifest-tool-local-pusher
54+
- name: pull-secret
55+
secret:
56+
secretName: registry-pull-credentials
57+
- name: push-secret
58+
secret:
59+
secretName: registry-push-credentials-ci-central
60+
- name: result-aggregator
61+
secret:
62+
secretName: result-aggregator

‎ci-operator/jobs/openshift-kni/scheduler-plugins/openshift-kni-scheduler-plugins-release-4.18-presubmits.yaml

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
presubmits:
2+
openshift-kni/scheduler-plugins:
3+
- agent: kubernetes
4+
always_run: true
5+
branches:
6+
- ^release-4\.18$
7+
- ^release-4\.18-
8+
cluster: build03
9+
context: ci/prow/ci-unit
10+
decorate: true
11+
decoration_config:
12+
skip_cloning: true
13+
labels:
14+
ci.openshift.io/generator: prowgen
15+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
16+
name: pull-ci-openshift-kni-scheduler-plugins-release-4.18-ci-unit
17+
rerun_command: /test ci-unit
18+
spec:
19+
containers:
20+
- args:
21+
- --gcs-upload-secret=/secrets/gcs/service-account.json
22+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
23+
- --report-credentials-file=/etc/report/credentials
24+
- --target=ci-unit
25+
command:
26+
- ci-operator
27+
image: ci-operator:latest
28+
imagePullPolicy: Always
29+
name: ""
30+
resources:
31+
requests:
32+
cpu: 10m
33+
volumeMounts:
34+
- mountPath: /secrets/gcs
35+
name: gcs-credentials
36+
readOnly: true
37+
- mountPath: /secrets/manifest-tool
38+
name: manifest-tool-local-pusher
39+
readOnly: true
40+
- mountPath: /etc/pull-secret
41+
name: pull-secret
42+
readOnly: true
43+
- mountPath: /etc/report
44+
name: result-aggregator
45+
readOnly: true
46+
serviceAccountName: ci-operator
47+
volumes:
48+
- name: manifest-tool-local-pusher
49+
secret:
50+
secretName: manifest-tool-local-pusher
51+
- name: pull-secret
52+
secret:
53+
secretName: registry-pull-credentials
54+
- name: result-aggregator
55+
secret:
56+
secretName: result-aggregator
57+
trigger: (?m)^/test( | .* )ci-unit,?($|\s.*)
58+
- agent: kubernetes
59+
always_run: true
60+
branches:
61+
- ^release-4\.18$
62+
- ^release-4\.18-
63+
cluster: build03
64+
context: ci/prow/images
65+
decorate: true
66+
decoration_config:
67+
skip_cloning: true
68+
labels:
69+
ci.openshift.io/generator: prowgen
70+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
71+
name: pull-ci-openshift-kni-scheduler-plugins-release-4.18-images
72+
rerun_command: /test images
73+
spec:
74+
containers:
75+
- args:
76+
- --gcs-upload-secret=/secrets/gcs/service-account.json
77+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
78+
- --report-credentials-file=/etc/report/credentials
79+
- --target=[images]
80+
command:
81+
- ci-operator
82+
image: ci-operator:latest
83+
imagePullPolicy: Always
84+
name: ""
85+
resources:
86+
requests:
87+
cpu: 10m
88+
volumeMounts:
89+
- mountPath: /secrets/gcs
90+
name: gcs-credentials
91+
readOnly: true
92+
- mountPath: /secrets/manifest-tool
93+
name: manifest-tool-local-pusher
94+
readOnly: true
95+
- mountPath: /etc/pull-secret
96+
name: pull-secret
97+
readOnly: true
98+
- mountPath: /etc/report
99+
name: result-aggregator
100+
readOnly: true
101+
serviceAccountName: ci-operator
102+
volumes:
103+
- name: manifest-tool-local-pusher
104+
secret:
105+
secretName: manifest-tool-local-pusher
106+
- name: pull-secret
107+
secret:
108+
secretName: registry-pull-credentials
109+
- name: result-aggregator
110+
secret:
111+
secretName: result-aggregator
112+
trigger: (?m)^/test( | .* )images,?($|\s.*)
113+
- agent: kubernetes
114+
always_run: true
115+
branches:
116+
- ^release-4\.18$
117+
- ^release-4\.18-
118+
cluster: build03
119+
context: ci/prow/security
120+
decorate: true
121+
decoration_config:
122+
skip_cloning: true
123+
labels:
124+
ci.openshift.io/generator: prowgen
125+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
126+
name: pull-ci-openshift-kni-scheduler-plugins-release-4.18-security
127+
optional: true
128+
rerun_command: /test security
129+
spec:
130+
containers:
131+
- args:
132+
- --gcs-upload-secret=/secrets/gcs/service-account.json
133+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
134+
- --report-credentials-file=/etc/report/credentials
135+
- --secret-dir=/secrets/ci-pull-credentials
136+
- --target=security
137+
command:
138+
- ci-operator
139+
image: ci-operator:latest
140+
imagePullPolicy: Always
141+
name: ""
142+
resources:
143+
requests:
144+
cpu: 10m
145+
volumeMounts:
146+
- mountPath: /secrets/ci-pull-credentials
147+
name: ci-pull-credentials
148+
readOnly: true
149+
- mountPath: /secrets/gcs
150+
name: gcs-credentials
151+
readOnly: true
152+
- mountPath: /secrets/manifest-tool
153+
name: manifest-tool-local-pusher
154+
readOnly: true
155+
- mountPath: /etc/pull-secret
156+
name: pull-secret
157+
readOnly: true
158+
- mountPath: /etc/report
159+
name: result-aggregator
160+
readOnly: true
161+
serviceAccountName: ci-operator
162+
volumes:
163+
- name: ci-pull-credentials
164+
secret:
165+
secretName: ci-pull-credentials
166+
- name: manifest-tool-local-pusher
167+
secret:
168+
secretName: manifest-tool-local-pusher
169+
- name: pull-secret
170+
secret:
171+
secretName: registry-pull-credentials
172+
- name: result-aggregator
173+
secret:
174+
secretName: result-aggregator
175+
trigger: (?m)^/test( | .* )security,?($|\s.*)

‎core-services/image-mirroring/openshift-kni/mapping_openshift-kni_quay

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ registry.ci.openshift.org/ocp-kni/telco-ran-tools:telco-ran-tools quay.io/opensh
1818
registry.ci.openshift.org/ocp-kni/telco-ran-tools-1.0:telco-ran-tools quay.io/openshift-kni/telco-ran-tools:1.0
1919
# scheduler-plugins
2020
registry.ci.openshift.org/ocp-kni/scheduler-plugins:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:test-ci
21-
registry.ci.openshift.org/ocp-kni/scheduler-plugins:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.18-snapshot
21+
registry.ci.openshift.org/ocp-kni/scheduler-plugins:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.19-snapshot
22+
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.18:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.18-snapshot
2223
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.17:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.17-snapshot
2324
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.16:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.16-snapshot
2425
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.15:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.15-snapshot

0 commit comments

Comments
 (0)