Skip to content

Commit 1118fd4

Browse files
sunzhaohua2sunzhaohua2
committed
update regress jobs
1 parent af33c15 commit 1118fd4

File tree

143 files changed

+967
-605
lines changed

Some content is hidden

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

143 files changed

+967
-605
lines changed

‎ci-operator/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-main.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: centos
44
namespace: openshift
55
tag: stream9
6+
cluster-api-actuator-pkg-test:
7+
name: cluster-api-actuator-pkg-test
8+
namespace: ci
9+
tag: latest
610
commitchecker:
711
name: commitchecker
812
namespace: ci
@@ -27,6 +31,10 @@ base_images:
2731
name: "4.20"
2832
namespace: ocp
2933
tag: rhel-coreos
34+
tests-private:
35+
name: tests-private
36+
namespace: ci
37+
tag: "4.20"
3038
binary_build_commands: make aws-cloud-controller-manager
3139
build_root:
3240
from_repository: true
@@ -116,6 +124,18 @@ tests:
116124
steps:
117125
cluster_profile: hypershift
118126
workflow: hypershift-aws-e2e-external
127+
- as: regression-clusterinfra-aws-ipi-ccm
128+
optional: true
129+
run_if_changed: ^(go\.mod|go\.sum)$
130+
steps:
131+
cluster_profile: aws-2
132+
env:
133+
E2E_RUN_TAGS: '@ccm'
134+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
135+
TEST_SCENARIOS: Cluster_Infrastructure CCM
136+
test:
137+
- chain: openshift-e2e-test-clusterinfra-qe-regression
138+
workflow: cucushift-installer-rehearse-aws-ipi
119139
- as: verify-commits
120140
commands: |
121141
commitchecker --start ${PULL_BASE_SHA:-main}

‎ci-operator/config/openshift/cloud-provider-azure/openshift-cloud-provider-azure-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ tests:
137137
steps:
138138
cluster_profile: azure4
139139
workflow: openshift-upgrade-azure
140-
- as: regression-clusterinfra-cucushift-rehearse-azure-ipi
140+
- as: regression-clusterinfra-azure-ipi-ccm
141141
optional: true
142142
run_if_changed: ^(go\.mod|go\.sum)$
143143
steps:
144144
cluster_profile: azure4
145145
env:
146146
E2E_RUN_TAGS: '@ccm'
147-
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm
147+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
148148
TEST_SCENARIOS: Cluster_Infrastructure CCM
149149
test:
150150
- chain: openshift-e2e-test-clusterinfra-qe-regression

‎ci-operator/config/openshift/cloud-provider-azure/openshift-cloud-provider-azure-release-4.20.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ base_images:
66
cluster-api-actuator-pkg-test:
77
name: cluster-api-actuator-pkg-test
88
namespace: ci
9-
tag: latest
9+
tag: "4.20"
1010
commitchecker:
1111
name: commitchecker
1212
namespace: ci
@@ -138,14 +138,14 @@ tests:
138138
steps:
139139
cluster_profile: azure4
140140
workflow: openshift-upgrade-azure
141-
- as: regression-clusterinfra-cucushift-rehearse-azure-ipi
141+
- as: regression-clusterinfra-azure-ipi-ccm
142142
optional: true
143143
run_if_changed: ^(go\.mod|go\.sum)$
144144
steps:
145145
cluster_profile: azure4
146146
env:
147147
E2E_RUN_TAGS: '@ccm'
148-
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm
148+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
149149
TEST_SCENARIOS: Cluster_Infrastructure CCM
150150
test:
151151
- chain: openshift-e2e-test-clusterinfra-qe-regression

‎ci-operator/config/openshift/cloud-provider-azure/openshift-cloud-provider-azure-release-4.21.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ tests:
137137
steps:
138138
cluster_profile: azure4
139139
workflow: openshift-upgrade-azure
140-
- as: regression-clusterinfra-cucushift-rehearse-azure-ipi
140+
- as: regression-clusterinfra-azure-ipi-ccm
141141
optional: true
142142
run_if_changed: ^(go\.mod|go\.sum)$
143143
steps:
144144
cluster_profile: azure4
145145
env:
146146
E2E_RUN_TAGS: '@ccm'
147-
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm
147+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
148148
TEST_SCENARIOS: Cluster_Infrastructure CCM
149149
test:
150150
- chain: openshift-e2e-test-clusterinfra-qe-regression

‎ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-main.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: centos
44
namespace: openshift
55
tag: stream9
6+
cluster-api-actuator-pkg-test:
7+
name: cluster-api-actuator-pkg-test
8+
namespace: ci
9+
tag: latest
610
commitchecker:
711
name: commitchecker
812
namespace: ci
@@ -104,17 +108,17 @@ tests:
104108
steps:
105109
cluster_profile: gcp
106110
workflow: openshift-e2e-gcp-upgrade
107-
- as: regression-clusterinfra-cucushift-rehearse-gcp-ipi
111+
- as: regression-clusterinfra-gcp-ipi-ccm
108112
optional: true
113+
run_if_changed: ^(go\.mod|go\.sum)$
109114
steps:
110115
cluster_profile: gcp-3
111116
env:
112-
TEST_FILTERS: NonHyperShiftHOST
117+
E2E_RUN_TAGS: '@ccm'
118+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
113119
TEST_SCENARIOS: Cluster_Infrastructure CCM
114-
TEST_TIMEOUT: "90"
115120
test:
116-
- ref: openshift-extended-test
117-
- ref: openshift-e2e-test-qe-report
121+
- chain: openshift-e2e-test-clusterinfra-qe-regression
118122
workflow: cucushift-installer-rehearse-gcp-ipi
119123
timeout: 7h0m0s
120124
- as: verify-commits

‎ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ tests:
104104
steps:
105105
cluster_profile: gcp
106106
workflow: openshift-e2e-gcp-upgrade
107-
- as: regression-clusterinfra-cucushift-rehearse-gcp-ipi
107+
- as: regression-clusterinfra-gcp-ipi-ccm
108108
optional: true
109109
steps:
110110
cluster_profile: gcp-3

‎ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.18.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: centos
44
namespace: openshift
55
tag: stream9
6+
cluster-api-actuator-pkg-test:
7+
name: cluster-api-actuator-pkg-test
8+
namespace: ci
9+
tag: "4.18"
610
commitchecker:
711
name: commitchecker
812
namespace: ci
@@ -104,17 +108,17 @@ tests:
104108
steps:
105109
cluster_profile: gcp
106110
workflow: openshift-e2e-gcp-upgrade
107-
- as: regression-clusterinfra-cucushift-rehearse-gcp-ipi
111+
- as: regression-clusterinfra-gcp-ipi-ccm
108112
optional: true
113+
run_if_changed: ^(go\.mod|go\.sum)$
109114
steps:
110115
cluster_profile: gcp-3
111116
env:
112-
TEST_FILTERS: NonHyperShiftHOST
117+
E2E_RUN_TAGS: '@ccm'
118+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
113119
TEST_SCENARIOS: Cluster_Infrastructure CCM
114-
TEST_TIMEOUT: "90"
115120
test:
116-
- ref: openshift-extended-test
117-
- ref: openshift-e2e-test-qe-report
121+
- chain: openshift-e2e-test-clusterinfra-qe-regression
118122
workflow: cucushift-installer-rehearse-gcp-ipi
119123
timeout: 7h0m0s
120124
- as: verify-commits

‎ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.19.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: centos
44
namespace: openshift
55
tag: stream9
6+
cluster-api-actuator-pkg-test:
7+
name: cluster-api-actuator-pkg-test
8+
namespace: ci
9+
tag: "4.19"
610
commitchecker:
711
name: commitchecker
812
namespace: ci
@@ -104,17 +108,17 @@ tests:
104108
steps:
105109
cluster_profile: gcp
106110
workflow: openshift-e2e-gcp-upgrade
107-
- as: regression-clusterinfra-cucushift-rehearse-gcp-ipi
111+
- as: regression-clusterinfra-gcp-ipi-ccm
108112
optional: true
113+
run_if_changed: ^(go\.mod|go\.sum)$
109114
steps:
110115
cluster_profile: gcp-3
111116
env:
112-
TEST_FILTERS: NonHyperShiftHOST
117+
E2E_RUN_TAGS: '@ccm'
118+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
113119
TEST_SCENARIOS: Cluster_Infrastructure CCM
114-
TEST_TIMEOUT: "90"
115120
test:
116-
- ref: openshift-extended-test
117-
- ref: openshift-e2e-test-qe-report
121+
- chain: openshift-e2e-test-clusterinfra-qe-regression
118122
workflow: cucushift-installer-rehearse-gcp-ipi
119123
timeout: 7h0m0s
120124
- as: verify-commits

‎ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.20.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: centos
44
namespace: openshift
55
tag: stream9
6+
cluster-api-actuator-pkg-test:
7+
name: cluster-api-actuator-pkg-test
8+
namespace: ci
9+
tag: "4.20"
610
commitchecker:
711
name: commitchecker
812
namespace: ci
@@ -105,17 +109,17 @@ tests:
105109
steps:
106110
cluster_profile: gcp
107111
workflow: openshift-e2e-gcp-upgrade
108-
- as: regression-clusterinfra-cucushift-rehearse-gcp-ipi
112+
- as: regression-clusterinfra-gcp-ipi-ccm
109113
optional: true
114+
run_if_changed: ^(go\.mod|go\.sum)$
110115
steps:
111116
cluster_profile: gcp-3
112117
env:
113-
TEST_FILTERS: NonHyperShiftHOST
118+
E2E_RUN_TAGS: '@ccm'
119+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
114120
TEST_SCENARIOS: Cluster_Infrastructure CCM
115-
TEST_TIMEOUT: "90"
116121
test:
117-
- ref: openshift-extended-test
118-
- ref: openshift-e2e-test-qe-report
122+
- chain: openshift-e2e-test-clusterinfra-qe-regression
119123
workflow: cucushift-installer-rehearse-gcp-ipi
120124
timeout: 7h0m0s
121125
- as: verify-commits

‎ci-operator/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-release-4.21.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: centos
44
namespace: openshift
55
tag: stream9
6+
cluster-api-actuator-pkg-test:
7+
name: cluster-api-actuator-pkg-test
8+
namespace: ci
9+
tag: latest
610
commitchecker:
711
name: commitchecker
812
namespace: ci
@@ -104,17 +108,17 @@ tests:
104108
steps:
105109
cluster_profile: gcp
106110
workflow: openshift-e2e-gcp-upgrade
107-
- as: regression-clusterinfra-cucushift-rehearse-gcp-ipi
111+
- as: regression-clusterinfra-gcp-ipi-ccm
108112
optional: true
113+
run_if_changed: ^(go\.mod|go\.sum)$
109114
steps:
110115
cluster_profile: gcp-3
111116
env:
112-
TEST_FILTERS: NonHyperShiftHOST
117+
E2E_RUN_TAGS: '@ccm'
118+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
113119
TEST_SCENARIOS: Cluster_Infrastructure CCM
114-
TEST_TIMEOUT: "90"
115120
test:
116-
- ref: openshift-extended-test
117-
- ref: openshift-e2e-test-qe-report
121+
- chain: openshift-e2e-test-clusterinfra-qe-regression
118122
workflow: cucushift-installer-rehearse-gcp-ipi
119123
timeout: 7h0m0s
120124
- as: verify-commits

‎ci-operator/config/openshift/cloud-provider-ibm/openshift-cloud-provider-ibm-main.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
cluster-api-actuator-pkg-test:
3+
name: cluster-api-actuator-pkg-test
4+
namespace: ci
5+
tag: latest
26
commitchecker:
37
name: commitchecker
48
namespace: ci
@@ -11,6 +15,10 @@ base_images:
1115
name: builder
1216
namespace: ocp
1317
tag: rhel-9-golang-1.24-openshift-4.20
18+
tests-private:
19+
name: tests-private
20+
namespace: ci
21+
tag: "4.20"
1422
binary_build_commands: go build .
1523
build_root:
1624
from_repository: true
@@ -70,6 +78,19 @@ tests:
7078
steps:
7179
cluster_profile: ibmcloud
7280
workflow: openshift-e2e-ibmcloud
81+
- as: regression-clusterinfra-ibmcloud-ipi-ccm
82+
optional: true
83+
run_if_changed: ^(go\.mod|go\.sum)$
84+
steps:
85+
cluster_profile: ibmcloud
86+
env:
87+
BASE_DOMAIN: ci-ibmcloud.devcluster.openshift.com
88+
E2E_RUN_TAGS: '@ccm'
89+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
90+
TEST_SCENARIOS: Cluster_Infrastructure CCM
91+
test:
92+
- chain: openshift-e2e-test-clusterinfra-qe-regression
93+
workflow: cucushift-installer-rehearse-ibmcloud-ipi
7394
- as: verify-commits
7495
commands: |
7596
commitchecker --start ${PULL_BASE_SHA:-main}

‎ci-operator/config/openshift/cloud-provider-nutanix/openshift-cloud-provider-nutanix-main.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
cluster-api-actuator-pkg-test:
3+
name: cluster-api-actuator-pkg-test
4+
namespace: ci
5+
tag: latest
26
commitchecker:
37
name: commitchecker
48
namespace: ci
@@ -11,6 +15,10 @@ base_images:
1115
name: builder
1216
namespace: ocp
1317
tag: rhel-9-golang-1.23-openshift-4.19
18+
tests-private:
19+
name: tests-private
20+
namespace: ci
21+
tag: "4.20"
1422
binary_build_commands: go build .
1523
build_root:
1624
from_repository: true
@@ -61,6 +69,19 @@ tests:
6169
test:
6270
- ref: windows-e2e-operator-test
6371
workflow: ipi-nutanix-ovn-hybrid
72+
- as: regression-clusterinfra-nutanix-ipi-ccm
73+
cluster: build01
74+
optional: true
75+
run_if_changed: ^(go\.mod|go\.sum)$
76+
steps:
77+
cluster_profile: nutanix
78+
env:
79+
E2E_RUN_TAGS: '@ccm'
80+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
81+
TEST_SCENARIOS: Cluster_Infrastructure CCM
82+
test:
83+
- chain: openshift-e2e-test-clusterinfra-qe-regression
84+
workflow: cucushift-installer-rehearse-nutanix-ipi
6485
- as: unit
6586
commands: make unit-test
6687
container:

‎ci-operator/config/openshift/cloud-provider-vsphere/openshift-cloud-provider-vsphere-main.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
cluster-api-actuator-pkg-test:
3+
name: cluster-api-actuator-pkg-test
4+
namespace: ci
5+
tag: latest
26
commitchecker:
37
name: commitchecker
48
namespace: ci
@@ -74,17 +78,17 @@ tests:
7478
steps:
7579
cluster_profile: vsphere-elastic
7680
workflow: openshift-upgrade-vsphere
77-
- as: regression-clusterinfra-cucushift-rehearse-vsphere-ipi
81+
- as: regression-clusterinfra-vsphere-ipi-ccm
7882
optional: true
83+
run_if_changed: ^(go\.mod|go\.sum)$
7984
steps:
8085
cluster_profile: vsphere-elastic
8186
env:
82-
TEST_FILTERS: NonHyperShiftHOST
83-
TEST_SCENARIOS: Cluster_Infrastructure
84-
TEST_TIMEOUT: "1200"
87+
E2E_RUN_TAGS: '@ccm'
88+
TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only
89+
TEST_SCENARIOS: Cluster_Infrastructure CCM
8590
test:
86-
- ref: openshift-extended-test
87-
- ref: openshift-e2e-test-qe-report
91+
- chain: openshift-e2e-test-clusterinfra-qe-regression
8892
workflow: cucushift-installer-rehearse-vsphere-ipi
8993
timeout: 7h0m0s
9094
- as: verify-commits

0 commit comments

Comments
 (0)