Skip to content

Commit f7e70cc

Browse files
fjglirafjglira
authored
Rollback to use again hypershift workflow on Istio jobs (#69630)
Signed-off-by: Francisco Herrera <fjglira@gmail.com>
1 parent afe338b commit f7e70cc

File tree

5 files changed

+72
-36
lines changed

5 files changed

+72
-36
lines changed

‎ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-gie-backport.yaml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ tests:
3939
steps:
4040
cluster_profile: ossm-aws
4141
env:
42+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
4243
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.26
4344
MAISTRA_NAMESPACE: maistra-e2e-test
4445
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -80,11 +81,12 @@ tests:
8081
cpu: 100m
8182
memory: 100Mi
8283
timeout: 1h0m0s
83-
workflow: servicemesh-istio-e2e-profile
84+
workflow: servicemesh-istio-e2e-hypershift
8485
- as: unit
8586
steps:
8687
cluster_profile: ossm-aws
8788
env:
89+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
8890
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.26
8991
MAISTRA_NAMESPACE: maistra-e2e-test
9092
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -122,11 +124,12 @@ tests:
122124
cpu: 100m
123125
memory: 100Mi
124126
timeout: 2h0m0s
125-
workflow: servicemesh-istio-e2e-profile
127+
workflow: servicemesh-istio-e2e-hypershift
126128
- as: integ-helm
127129
steps:
128130
cluster_profile: ossm-aws
129131
env:
132+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
130133
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.26
131134
MAISTRA_NAMESPACE: maistra-e2e-test
132135
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -178,11 +181,12 @@ tests:
178181
cpu: 100m
179182
memory: 100Mi
180183
timeout: 2h0m0s
181-
workflow: servicemesh-istio-e2e-profile
184+
workflow: servicemesh-istio-e2e-hypershift
182185
- as: integ-security
183186
steps:
184187
cluster_profile: ossm-aws
185188
env:
189+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
186190
COMPUTE_NODE_TYPE: m5.2xlarge
187191
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.26
188192
MAISTRA_NAMESPACE: maistra-e2e-test
@@ -234,11 +238,12 @@ tests:
234238
cpu: 100m
235239
memory: 100Mi
236240
timeout: 2h0m0s
237-
workflow: servicemesh-istio-e2e-profile
241+
workflow: servicemesh-istio-e2e-hypershift
238242
- as: integ-pilot
239243
steps:
240244
cluster_profile: ossm-aws
241245
env:
246+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
242247
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.26
243248
MAISTRA_NAMESPACE: maistra-e2e-test
244249
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -290,11 +295,12 @@ tests:
290295
cpu: 100m
291296
memory: 100Mi
292297
timeout: 2h0m0s
293-
workflow: servicemesh-istio-e2e-profile
298+
workflow: servicemesh-istio-e2e-hypershift
294299
- as: integ-telemetry
295300
steps:
296301
cluster_profile: ossm-aws
297302
env:
303+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
298304
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.26
299305
MAISTRA_NAMESPACE: maistra-e2e-test
300306
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -345,7 +351,7 @@ tests:
345351
cpu: 100m
346352
memory: 100Mi
347353
timeout: 2h0m0s
348-
workflow: servicemesh-istio-e2e-profile
354+
workflow: servicemesh-istio-e2e-hypershift
349355
zz_generated_metadata:
350356
branch: gie-backport
351357
org: openshift-service-mesh

‎ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ tests:
6565
steps:
6666
cluster_profile: ossm-aws
6767
env:
68+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
6869
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
6970
MAISTRA_NAMESPACE: maistra-e2e-test
7071
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -106,11 +107,12 @@ tests:
106107
cpu: 100m
107108
memory: 100Mi
108109
timeout: 1h0m0s
109-
workflow: servicemesh-istio-e2e-profile
110+
workflow: servicemesh-istio-e2e-hypershift
110111
- as: unit
111112
steps:
112113
cluster_profile: ossm-aws
113114
env:
115+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
114116
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
115117
MAISTRA_NAMESPACE: maistra-e2e-test
116118
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -148,11 +150,12 @@ tests:
148150
cpu: 100m
149151
memory: 100Mi
150152
timeout: 2h0m0s
151-
workflow: servicemesh-istio-e2e-profile
153+
workflow: servicemesh-istio-e2e-hypershift
152154
- as: istio-integration-pilot
153155
steps:
154156
cluster_profile: ossm-aws
155157
env:
158+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
156159
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
157160
MAISTRA_NAMESPACE: maistra-e2e-test
158161
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -204,11 +207,12 @@ tests:
204207
cpu: 100m
205208
memory: 100Mi
206209
timeout: 2h0m0s
207-
workflow: servicemesh-istio-e2e-profile
210+
workflow: servicemesh-istio-e2e-hypershift
208211
- as: istio-integration-telemetry
209212
steps:
210213
cluster_profile: ossm-aws
211214
env:
215+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
212216
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
213217
MAISTRA_NAMESPACE: maistra-e2e-test
214218
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -259,11 +263,12 @@ tests:
259263
cpu: 100m
260264
memory: 100Mi
261265
timeout: 2h0m0s
262-
workflow: servicemesh-istio-e2e-profile
266+
workflow: servicemesh-istio-e2e-hypershift
263267
- as: istio-integration-security
264268
steps:
265269
cluster_profile: ossm-aws
266270
env:
271+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
267272
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
268273
MAISTRA_NAMESPACE: maistra-e2e-test
269274
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -314,11 +319,12 @@ tests:
314319
cpu: 100m
315320
memory: 100Mi
316321
timeout: 2h0m0s
317-
workflow: servicemesh-istio-e2e-profile
322+
workflow: servicemesh-istio-e2e-hypershift
318323
- as: istio-integration-ambient
319324
steps:
320325
cluster_profile: ossm-aws
321326
env:
327+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
322328
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
323329
MAISTRA_NAMESPACE: maistra-e2e-test
324330
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -371,11 +377,12 @@ tests:
371377
cpu: 100m
372378
memory: 100Mi
373379
timeout: 2h0m0s
374-
workflow: servicemesh-istio-e2e-profile
380+
workflow: servicemesh-istio-e2e-hypershift
375381
- as: istio-integration-helm
376382
steps:
377383
cluster_profile: ossm-aws
378384
env:
385+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
379386
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
380387
MAISTRA_NAMESPACE: maistra-e2e-test
381388
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -426,11 +433,12 @@ tests:
426433
cpu: 100m
427434
memory: 100Mi
428435
timeout: 2h0m0s
429-
workflow: servicemesh-istio-e2e-profile
436+
workflow: servicemesh-istio-e2e-hypershift
430437
- as: istio-integration-sail-pilot
431438
steps:
432439
cluster_profile: ossm-aws
433440
env:
441+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
434442
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
435443
MAISTRA_NAMESPACE: maistra-e2e-test
436444
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -484,11 +492,12 @@ tests:
484492
cpu: 100m
485493
memory: 100Mi
486494
timeout: 3h0m0s
487-
workflow: servicemesh-istio-e2e-profile
495+
workflow: servicemesh-istio-e2e-hypershift
488496
- as: istio-integration-sail-telemetry
489497
steps:
490498
cluster_profile: ossm-aws
491499
env:
500+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
492501
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
493502
MAISTRA_NAMESPACE: maistra-e2e-test
494503
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -542,11 +551,12 @@ tests:
542551
cpu: 100m
543552
memory: 100Mi
544553
timeout: 3h0m0s
545-
workflow: servicemesh-istio-e2e-profile
554+
workflow: servicemesh-istio-e2e-hypershift
546555
- as: istio-integration-sail-security
547556
steps:
548557
cluster_profile: ossm-aws
549558
env:
559+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
550560
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
551561
MAISTRA_NAMESPACE: maistra-e2e-test
552562
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -600,11 +610,12 @@ tests:
600610
cpu: 100m
601611
memory: 100Mi
602612
timeout: 3h0m0s
603-
workflow: servicemesh-istio-e2e-profile
613+
workflow: servicemesh-istio-e2e-hypershift
604614
- as: istio-integration-sail-ambient
605615
steps:
606616
cluster_profile: ossm-aws
607617
env:
618+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
608619
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-master
609620
MAISTRA_NAMESPACE: maistra-e2e-test
610621
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -660,7 +671,7 @@ tests:
660671
cpu: 100m
661672
memory: 100Mi
662673
timeout: 3h0m0s
663-
workflow: servicemesh-istio-e2e-profile
674+
workflow: servicemesh-istio-e2e-hypershift
664675
zz_generated_metadata:
665676
branch: master
666677
org: openshift-service-mesh

‎ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ tests:
5151
steps:
5252
cluster_profile: ossm-aws
5353
env:
54+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
5455
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24
5556
MAISTRA_NAMESPACE: maistra-e2e-test
5657
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -88,11 +89,12 @@ tests:
8889
cpu: 100m
8990
memory: 100Mi
9091
timeout: 2h0m0s
91-
workflow: servicemesh-istio-e2e-profile
92+
workflow: servicemesh-istio-e2e-hypershift
9293
- as: integ-helm
9394
steps:
9495
cluster_profile: ossm-aws
9596
env:
97+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
9698
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24
9799
MAISTRA_NAMESPACE: maistra-e2e-test
98100
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -144,11 +146,12 @@ tests:
144146
cpu: 100m
145147
memory: 100Mi
146148
timeout: 2h0m0s
147-
workflow: servicemesh-istio-e2e-profile
149+
workflow: servicemesh-istio-e2e-hypershift
148150
- as: integ-security
149151
steps:
150152
cluster_profile: ossm-aws
151153
env:
154+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
152155
COMPUTE_NODE_TYPE: m5.2xlarge
153156
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24
154157
MAISTRA_NAMESPACE: maistra-e2e-test
@@ -200,11 +203,12 @@ tests:
200203
cpu: 100m
201204
memory: 100Mi
202205
timeout: 2h0m0s
203-
workflow: servicemesh-istio-e2e-profile
206+
workflow: servicemesh-istio-e2e-hypershift
204207
- as: integ-pilot
205208
steps:
206209
cluster_profile: ossm-aws
207210
env:
211+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
208212
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24
209213
MAISTRA_NAMESPACE: maistra-e2e-test
210214
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -256,11 +260,12 @@ tests:
256260
cpu: 100m
257261
memory: 100Mi
258262
timeout: 2h0m0s
259-
workflow: servicemesh-istio-e2e-profile
263+
workflow: servicemesh-istio-e2e-hypershift
260264
- as: integ-telemetry
261265
steps:
262266
cluster_profile: ossm-aws
263267
env:
268+
BASE_DOMAIN: servicemesh.devcluster.openshift.com
264269
MAISTRA_BUILDER_IMAGE: quay-proxy.ci.openshift.org/openshift/ci:ci_maistra-builder_upstream-1.24
265270
MAISTRA_NAMESPACE: maistra-e2e-test
266271
MAISTRA_SC_POD: maistra-e2e-test-sc-pod
@@ -311,7 +316,7 @@ tests:
311316
cpu: 100m
312317
memory: 100Mi
313318
timeout: 2h0m0s
314-
workflow: servicemesh-istio-e2e-profile
319+
workflow: servicemesh-istio-e2e-hypershift
315320
zz_generated_metadata:
316321
branch: release-1.24
317322
org: openshift-service-mesh

0 commit comments

Comments
 (0)