Skip to content

Commit 9f5fc93

Browse files
authored
wmco: replace WS2019 for WS2025 in azure-e2e job (#77975)
this commit removes Windows Server 2019 job references and update to Windows Server 2025 from periodic to presubmit in configuration files
1 parent 94f1bbd commit 9f5fc93

7 files changed

Lines changed: 3 additions & 191 deletions

ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,6 @@ tests:
140140
- always_run: false
141141
as: azure-e2e-operator
142142
skip_if_only_changed: ^(?:ote|docs|\.github|\.tekton)/|\.md$|^(?:\.gitignore|renovate\.json|OWNERS|PROJECT|LICENSE|Containerfile|Containerfile.bundle)$
143-
steps:
144-
cluster_profile: openshift-org-azure
145-
env:
146-
COMPUTE_NODE_REPLICAS: "1"
147-
CONTROL_PLANE_REPLICAS: "1"
148-
WINDOWS_SERVER_VERSION: "2019"
149-
test:
150-
- ref: windows-e2e-operator-test
151-
workflow: ipi-azure-ovn-hybrid
152-
- always_run: false
153-
as: azure-e2e-operator-2025
154-
cron: 0 2 * * 1
155143
steps:
156144
cluster_profile: openshift-org-azure
157145
env:

ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.22.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,6 @@ tests:
140140
- always_run: false
141141
as: azure-e2e-operator
142142
skip_if_only_changed: ^(?:ote|docs|\.github|\.tekton)/|\.md$|^(?:\.gitignore|renovate\.json|OWNERS|PROJECT|LICENSE|Containerfile|Containerfile.bundle)$
143-
steps:
144-
cluster_profile: openshift-org-azure
145-
env:
146-
COMPUTE_NODE_REPLICAS: "1"
147-
CONTROL_PLANE_REPLICAS: "1"
148-
WINDOWS_SERVER_VERSION: "2019"
149-
test:
150-
- ref: windows-e2e-operator-test
151-
workflow: ipi-azure-ovn-hybrid
152-
- always_run: false
153-
as: azure-e2e-operator-2025
154-
cron: 0 2 * * 1
155143
steps:
156144
cluster_profile: openshift-org-azure
157145
env:

ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.23.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ tests:
115115
env:
116116
COMPUTE_NODE_REPLICAS: "1"
117117
CONTROL_PLANE_REPLICAS: "1"
118-
WINDOWS_SERVER_VERSION: "2019"
118+
WINDOWS_SERVER_VERSION: "2025"
119119
test:
120120
- ref: windows-e2e-operator-test
121121
workflow: ipi-azure-ovn-hybrid

ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-5.0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ tests:
116116
env:
117117
COMPUTE_NODE_REPLICAS: "1"
118118
CONTROL_PLANE_REPLICAS: "1"
119-
WINDOWS_SERVER_VERSION: "2019"
119+
WINDOWS_SERVER_VERSION: "2025"
120120
test:
121121
- ref: windows-e2e-operator-test
122122
workflow: ipi-azure-ovn-hybrid

ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-5.1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ tests:
115115
env:
116116
COMPUTE_NODE_REPLICAS: "1"
117117
CONTROL_PLANE_REPLICAS: "1"
118-
WINDOWS_SERVER_VERSION: "2019"
118+
WINDOWS_SERVER_VERSION: "2025"
119119
test:
120120
- ref: windows-e2e-operator-test
121121
workflow: ipi-azure-ovn-hybrid

ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-master-periodics.yaml

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -171,92 +171,6 @@ periodics:
171171
- name: result-aggregator
172172
secret:
173173
secretName: result-aggregator
174-
- agent: kubernetes
175-
cluster: build11
176-
cron: 0 2 * * 1
177-
decorate: true
178-
extra_refs:
179-
- base_ref: master
180-
org: openshift
181-
repo: windows-machine-config-operator
182-
labels:
183-
ci-operator.openshift.io/cloud: azure4
184-
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
185-
ci.openshift.io/generator: prowgen
186-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
187-
name: periodic-ci-openshift-windows-machine-config-operator-master-azure-e2e-operator-2025
188-
reporter_config:
189-
slack:
190-
channel: '#forum-ocp-winc'
191-
job_states_to_report:
192-
- failure
193-
- error
194-
report_template: <!subteam^S025TMX0LF3> Job {{.Spec.Job}} ended with {{.Status.State}}.
195-
<{{.Status.URL}}|View logs>. Please investigate.
196-
spec:
197-
containers:
198-
- args:
199-
- --gcs-upload-secret=/secrets/gcs/service-account.json
200-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
201-
- --lease-server-credentials-file=/etc/boskos/credentials
202-
- --report-credentials-file=/etc/report/credentials
203-
- --secret-dir=/secrets/ci-pull-credentials
204-
- --target=azure-e2e-operator-2025
205-
command:
206-
- ci-operator
207-
env:
208-
- name: HTTP_SERVER_IP
209-
valueFrom:
210-
fieldRef:
211-
fieldPath: status.podIP
212-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
213-
imagePullPolicy: Always
214-
name: ""
215-
ports:
216-
- containerPort: 8080
217-
name: http
218-
resources:
219-
requests:
220-
cpu: 10m
221-
volumeMounts:
222-
- mountPath: /etc/boskos
223-
name: boskos
224-
readOnly: true
225-
- mountPath: /secrets/ci-pull-credentials
226-
name: ci-pull-credentials
227-
readOnly: true
228-
- mountPath: /secrets/gcs
229-
name: gcs-credentials
230-
readOnly: true
231-
- mountPath: /secrets/manifest-tool
232-
name: manifest-tool-local-pusher
233-
readOnly: true
234-
- mountPath: /etc/pull-secret
235-
name: pull-secret
236-
readOnly: true
237-
- mountPath: /etc/report
238-
name: result-aggregator
239-
readOnly: true
240-
serviceAccountName: ci-operator
241-
volumes:
242-
- name: boskos
243-
secret:
244-
items:
245-
- key: credentials
246-
path: credentials
247-
secretName: boskos-credentials
248-
- name: ci-pull-credentials
249-
secret:
250-
secretName: ci-pull-credentials
251-
- name: manifest-tool-local-pusher
252-
secret:
253-
secretName: manifest-tool-local-pusher
254-
- name: pull-secret
255-
secret:
256-
secretName: registry-pull-credentials
257-
- name: result-aggregator
258-
secret:
259-
secretName: result-aggregator
260174
- agent: kubernetes
261175
cluster: build08
262176
cron: 0 2 * * 1

ci-operator/jobs/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.22-periodics.yaml

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -155,84 +155,6 @@ periodics:
155155
- name: result-aggregator
156156
secret:
157157
secretName: result-aggregator
158-
- agent: kubernetes
159-
cluster: build01
160-
cron: 0 2 * * 1
161-
decorate: true
162-
extra_refs:
163-
- base_ref: release-4.22
164-
org: openshift
165-
repo: windows-machine-config-operator
166-
labels:
167-
ci-operator.openshift.io/cloud: azure4
168-
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
169-
ci.openshift.io/generator: prowgen
170-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
171-
name: periodic-ci-openshift-windows-machine-config-operator-release-4.22-azure-e2e-operator-2025
172-
spec:
173-
containers:
174-
- args:
175-
- --gcs-upload-secret=/secrets/gcs/service-account.json
176-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
177-
- --lease-server-credentials-file=/etc/boskos/credentials
178-
- --report-credentials-file=/etc/report/credentials
179-
- --secret-dir=/secrets/ci-pull-credentials
180-
- --target=azure-e2e-operator-2025
181-
command:
182-
- ci-operator
183-
env:
184-
- name: HTTP_SERVER_IP
185-
valueFrom:
186-
fieldRef:
187-
fieldPath: status.podIP
188-
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
189-
imagePullPolicy: Always
190-
name: ""
191-
ports:
192-
- containerPort: 8080
193-
name: http
194-
resources:
195-
requests:
196-
cpu: 10m
197-
volumeMounts:
198-
- mountPath: /etc/boskos
199-
name: boskos
200-
readOnly: true
201-
- mountPath: /secrets/ci-pull-credentials
202-
name: ci-pull-credentials
203-
readOnly: true
204-
- mountPath: /secrets/gcs
205-
name: gcs-credentials
206-
readOnly: true
207-
- mountPath: /secrets/manifest-tool
208-
name: manifest-tool-local-pusher
209-
readOnly: true
210-
- mountPath: /etc/pull-secret
211-
name: pull-secret
212-
readOnly: true
213-
- mountPath: /etc/report
214-
name: result-aggregator
215-
readOnly: true
216-
serviceAccountName: ci-operator
217-
volumes:
218-
- name: boskos
219-
secret:
220-
items:
221-
- key: credentials
222-
path: credentials
223-
secretName: boskos-credentials
224-
- name: ci-pull-credentials
225-
secret:
226-
secretName: ci-pull-credentials
227-
- name: manifest-tool-local-pusher
228-
secret:
229-
secretName: manifest-tool-local-pusher
230-
- name: pull-secret
231-
secret:
232-
secretName: registry-pull-credentials
233-
- name: result-aggregator
234-
secret:
235-
secretName: result-aggregator
236158
- agent: kubernetes
237159
cluster: build08
238160
cron: 0 2 * * 1

0 commit comments

Comments
 (0)