Skip to content

Commit 1242fde

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #63456 from openshift-bot/auto-config-brancher
Automate config brancher by auto-config-brancher job at Fri, 04 Apr 2025 04:07:40 UTC
2 parents e4d9a44 + 79a8a17 commit 1242fde

File tree

91 files changed

+1078
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1078
-287
lines changed

‎ci-operator/config/openshift-priv/descheduler/openshift-priv-descheduler-release-4.18.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
base_images:
2-
ocp_builder_rhel-9-base-openshift-4.17:
2+
ocp_builder_rhel-9-base-openshift-4.19:
33
name: builder
44
namespace: ocp
5-
tag: rhel-9-base-openshift-4.17
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
5+
tag: rhel-9-base-openshift-4.19
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.17
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
binary_build_commands: make build
1111
build_root:
1212
from_repository: true
1313
canonical_go_repository: sigs.k8s.io/descheduler
1414
images:
1515
- dockerfile_path: images/descheduler/Dockerfile.rhel7
1616
inputs:
17-
ocp_builder_rhel-9-base-openshift-4.17:
17+
ocp_builder_rhel-9-base-openshift-4.19:
1818
as:
19-
- registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.17
20-
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
19+
- registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.19
20+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
2121
as:
22-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
22+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2323
to: descheduler
2424
promotion:
2525
to:

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,15 @@ tests:
647647
cluster_profile: gcp
648648
workflow: openshift-upgrade-gcp-latestinstaller
649649
timeout: 6h0m0s
650+
- always_run: false
651+
as: e2e-metal-ovn-two-node-arbiter
652+
cluster: build05
653+
optional: true
654+
run_if_changed: (baremetal|metal3|ironic)
655+
steps:
656+
cluster_profile: equinix-ocp-metal
657+
workflow: baremetalds-arbiter
658+
timeout: 5h0m0s
650659
- as: e2e-metal-ipi-ovn
651660
cluster: build05
652661
optional: true
@@ -841,7 +850,7 @@ tests:
841850
cluster_profile: vsphere-elastic
842851
workflow: openshift-e2e-vsphere-staticip
843852
timeout: 6h0m0s
844-
- as: e2e-vsphere-ovn-multi-network
853+
- as: e2e-vsphere-ovn-multi-network-techpreview
845854
optional: true
846855
steps:
847856
cluster_profile: vsphere-elastic
@@ -853,6 +862,16 @@ tests:
853862
enable:
854863
- observers-resource-watch
855864
workflow: openshift-e2e-vsphere
865+
- as: e2e-vsphere-ovn-multi-network
866+
optional: true
867+
steps:
868+
cluster_profile: vsphere-elastic
869+
env:
870+
MULTI_NIC_IPI: "true"
871+
observers:
872+
enable:
873+
- observers-resource-watch
874+
workflow: openshift-e2e-vsphere
856875
- as: e2e-vsphere-ovn-multi-disk
857876
optional: true
858877
run_if_changed: vsphere

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,15 @@ tests:
648648
cluster_profile: gcp
649649
workflow: openshift-upgrade-gcp-latestinstaller
650650
timeout: 6h0m0s
651+
- always_run: false
652+
as: e2e-metal-ovn-two-node-arbiter
653+
cluster: build05
654+
optional: true
655+
run_if_changed: (baremetal|metal3|ironic)
656+
steps:
657+
cluster_profile: equinix-ocp-metal
658+
workflow: baremetalds-arbiter
659+
timeout: 5h0m0s
651660
- as: e2e-metal-ipi-ovn
652661
cluster: build05
653662
optional: true
@@ -842,7 +851,7 @@ tests:
842851
cluster_profile: vsphere-elastic
843852
workflow: openshift-e2e-vsphere-staticip
844853
timeout: 6h0m0s
845-
- as: e2e-vsphere-ovn-multi-network
854+
- as: e2e-vsphere-ovn-multi-network-techpreview
846855
optional: true
847856
steps:
848857
cluster_profile: vsphere-elastic
@@ -854,6 +863,16 @@ tests:
854863
enable:
855864
- observers-resource-watch
856865
workflow: openshift-e2e-vsphere
866+
- as: e2e-vsphere-ovn-multi-network
867+
optional: true
868+
steps:
869+
cluster_profile: vsphere-elastic
870+
env:
871+
MULTI_NIC_IPI: "true"
872+
observers:
873+
enable:
874+
- observers-resource-watch
875+
workflow: openshift-e2e-vsphere
857876
- as: e2e-vsphere-ovn-multi-disk
858877
optional: true
859878
run_if_changed: vsphere

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,15 @@ tests:
647647
cluster_profile: gcp
648648
workflow: openshift-upgrade-gcp-latestinstaller
649649
timeout: 6h0m0s
650+
- always_run: false
651+
as: e2e-metal-ovn-two-node-arbiter
652+
cluster: build05
653+
optional: true
654+
run_if_changed: (baremetal|metal3|ironic)
655+
steps:
656+
cluster_profile: equinix-ocp-metal
657+
workflow: baremetalds-arbiter
658+
timeout: 5h0m0s
650659
- as: e2e-metal-ipi-ovn
651660
cluster: build05
652661
optional: true
@@ -841,7 +850,7 @@ tests:
841850
cluster_profile: vsphere-elastic
842851
workflow: openshift-e2e-vsphere-staticip
843852
timeout: 6h0m0s
844-
- as: e2e-vsphere-ovn-multi-network
853+
- as: e2e-vsphere-ovn-multi-network-techpreview
845854
optional: true
846855
steps:
847856
cluster_profile: vsphere-elastic
@@ -853,6 +862,16 @@ tests:
853862
enable:
854863
- observers-resource-watch
855864
workflow: openshift-e2e-vsphere
865+
- as: e2e-vsphere-ovn-multi-network
866+
optional: true
867+
steps:
868+
cluster_profile: vsphere-elastic
869+
env:
870+
MULTI_NIC_IPI: "true"
871+
observers:
872+
enable:
873+
- observers-resource-watch
874+
workflow: openshift-e2e-vsphere
856875
- as: e2e-vsphere-ovn-multi-disk
857876
optional: true
858877
run_if_changed: vsphere

‎ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ tests:
103103
MICROSHIFT_OS: rhel-9.4
104104
workflow: openshift-microshift-e2e-metal-tests
105105
- as: e2e-aws-tests-cache
106-
cluster: build11
106+
capabilities:
107+
- intranet
107108
restrict_network_access: false
108109
run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
109110
steps:
@@ -112,7 +113,8 @@ tests:
112113
MICROSHIFT_OS: rhel-9.4
113114
workflow: openshift-microshift-e2e-metal-cache
114115
- as: e2e-aws-tests-cache-arm
115-
cluster: build11
116+
capabilities:
117+
- intranet
116118
restrict_network_access: false
117119
run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
118120
steps:

‎ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.19.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ tests:
104104
MICROSHIFT_OS: rhel-9.4
105105
workflow: openshift-microshift-e2e-metal-tests
106106
- as: e2e-aws-tests-cache
107-
cluster: build11
107+
capabilities:
108+
- intranet
108109
restrict_network_access: false
109110
run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
110111
steps:
@@ -113,7 +114,8 @@ tests:
113114
MICROSHIFT_OS: rhel-9.4
114115
workflow: openshift-microshift-e2e-metal-cache
115116
- as: e2e-aws-tests-cache-arm
116-
cluster: build11
117+
capabilities:
118+
- intranet
117119
restrict_network_access: false
118120
run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
119121
steps:

‎ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.20.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ tests:
103103
MICROSHIFT_OS: rhel-9.4
104104
workflow: openshift-microshift-e2e-metal-tests
105105
- as: e2e-aws-tests-cache
106-
cluster: build11
106+
capabilities:
107+
- intranet
107108
restrict_network_access: false
108109
run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
109110
steps:
@@ -112,7 +113,8 @@ tests:
112113
MICROSHIFT_OS: rhel-9.4
113114
workflow: openshift-microshift-e2e-metal-cache
114115
- as: e2e-aws-tests-cache-arm
115-
cluster: build11
116+
capabilities:
117+
- intranet
116118
restrict_network_access: false
117119
run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$
118120
steps:

‎ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.17.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
base_images:
2+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
3+
name: builder
4+
namespace: ocp
5+
tag: rhel-9-golang-1.22-openshift-4.17
16
build_root:
27
image_stream_tag:
38
name: release
@@ -6,6 +11,10 @@ build_root:
611
canonical_go_repository: github.com/openshift/monitoring-plugin
712
images:
813
- dockerfile_path: Dockerfile
14+
inputs:
15+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
16+
as:
17+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
918
to: monitoring-plugin
1019
- dockerfile_path: Dockerfile.test
1120
to: monitoring-plugin-test

‎ci-operator/config/openshift-priv/monitoring-plugin/openshift-priv-monitoring-plugin-release-4.18.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: hypershift-operator
44
namespace: hypershift
55
tag: latest
6+
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
7+
name: builder
8+
namespace: ocp
9+
tag: rhel-9-golang-1.22-openshift-4.18
610
build_root:
711
image_stream_tag:
812
name: release
@@ -11,6 +15,10 @@ build_root:
1115
canonical_go_repository: github.com/openshift/monitoring-plugin
1216
images:
1317
- dockerfile_path: Dockerfile
18+
inputs:
19+
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
20+
as:
21+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
1422
to: monitoring-plugin
1523
- dockerfile_path: Dockerfile.test
1624
to: monitoring-plugin-test

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-master.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,8 @@ tests:
240240
env:
241241
BASE_DOMAIN: qe.devcluster.openshift.com
242242
FORCE_SUCCESS_EXIT: "no"
243-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
244-
TEST_SCENARIOS: DR_Testing
245-
TEST_TIMEOUT: "50"
246243
test:
247-
- ref: openshift-extended-test
244+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
248245
workflow: cucushift-installer-rehearse-aws-ipi-private
249246
- as: debug-disasterrecovery-baremetal-upi
250247
optional: true
@@ -256,12 +253,9 @@ tests:
256253
env:
257254
AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
258255
FORCE_SUCCESS_EXIT: "no"
259-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
260-
TEST_SCENARIOS: DR_Testing
261-
TEST_TIMEOUT: "50"
262256
architecture: arm64
263257
test:
264-
- ref: openshift-extended-test
258+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
265259
workflow: baremetal-lab-upi
266260
- as: debug-winc-aws-ipi
267261
optional: true

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.12.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,8 @@ tests:
208208
env:
209209
BASE_DOMAIN: qe.devcluster.openshift.com
210210
FORCE_SUCCESS_EXIT: "no"
211-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
212-
TEST_SCENARIOS: DR_Testing
213-
TEST_TIMEOUT: "50"
214211
test:
215-
- ref: openshift-extended-test
212+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
216213
workflow: cucushift-installer-rehearse-aws-ipi-private
217214
- as: debug-winc-aws-ipi
218215
optional: true

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.13.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,8 @@ tests:
221221
env:
222222
BASE_DOMAIN: qe.devcluster.openshift.com
223223
FORCE_SUCCESS_EXIT: "no"
224-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
225-
TEST_SCENARIOS: DR_Testing
226-
TEST_TIMEOUT: "50"
227224
test:
228-
- ref: openshift-extended-test
225+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
229226
workflow: cucushift-installer-rehearse-aws-ipi-private
230227
- as: debug-winc-aws-ipi
231228
optional: true

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.14.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,8 @@ tests:
227227
env:
228228
BASE_DOMAIN: qe.devcluster.openshift.com
229229
FORCE_SUCCESS_EXIT: "no"
230-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
231-
TEST_SCENARIOS: DR_Testing
232-
TEST_TIMEOUT: "50"
233230
test:
234-
- ref: openshift-extended-test
231+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
235232
workflow: cucushift-installer-rehearse-aws-ipi-private
236233
- as: debug-disasterrecovery-baremetal-upi
237234
optional: true
@@ -243,12 +240,9 @@ tests:
243240
env:
244241
AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
245242
FORCE_SUCCESS_EXIT: "no"
246-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
247-
TEST_SCENARIOS: DR_Testing
248-
TEST_TIMEOUT: "50"
249243
architecture: arm64
250244
test:
251-
- ref: openshift-extended-test
245+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
252246
workflow: baremetal-lab-upi
253247
- as: debug-winc-aws-ipi
254248
optional: true

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.15.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,8 @@ tests:
237237
env:
238238
BASE_DOMAIN: qe.devcluster.openshift.com
239239
FORCE_SUCCESS_EXIT: "no"
240-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
241-
TEST_SCENARIOS: DR_Testing
242-
TEST_TIMEOUT: "50"
243240
test:
244-
- ref: openshift-extended-test
241+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
245242
workflow: cucushift-installer-rehearse-aws-ipi-private
246243
- as: debug-disasterrecovery-baremetal-upi
247244
optional: true
@@ -253,12 +250,9 @@ tests:
253250
env:
254251
AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
255252
FORCE_SUCCESS_EXIT: "no"
256-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
257-
TEST_SCENARIOS: DR_Testing
258-
TEST_TIMEOUT: "50"
259253
architecture: arm64
260254
test:
261-
- ref: openshift-extended-test
255+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
262256
workflow: baremetal-lab-upi
263257
- as: debug-winc-aws-ipi
264258
optional: true

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.16.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,8 @@ tests:
244244
env:
245245
BASE_DOMAIN: qe.devcluster.openshift.com
246246
FORCE_SUCCESS_EXIT: "no"
247-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
248-
TEST_SCENARIOS: DR_Testing
249-
TEST_TIMEOUT: "50"
250247
test:
251-
- ref: openshift-extended-test
248+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
252249
workflow: cucushift-installer-rehearse-aws-ipi-private
253250
- as: debug-disasterrecovery-baremetal-upi
254251
optional: true
@@ -260,12 +257,9 @@ tests:
260257
env:
261258
AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
262259
FORCE_SUCCESS_EXIT: "no"
263-
TEST_FILTERS: ~ChkUpgrade&;~ConnectedOnly&;~MicroShiftOnly&;DEBUGPHASE&
264-
TEST_SCENARIOS: DR_Testing
265-
TEST_TIMEOUT: "50"
266260
architecture: arm64
267261
test:
268-
- ref: openshift-extended-test
262+
- chain: openshift-e2e-test-qe-disasterrecovery-sanity
269263
workflow: baremetal-lab-upi
270264
- as: debug-winc-aws-ipi
271265
optional: true

0 commit comments

Comments
 (0)