Skip to content

Commit 5d0e2ea

Browse files
Merge pull request #21338 from JoelSpeed/gcp-vsphere-tpnu
Add TechPreviewNoUpgrade Periodics for GCP and VSphere
2 parents b3f26e0 + f3cdb6b commit 5d0e2ea

16 files changed

Lines changed: 438 additions & 0 deletions

ci-operator/config/openshift/release/openshift-release-master__ci-4.10.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@ tests:
184184
steps:
185185
cluster_profile: gcp-openshift-gce-devel-ci-2
186186
workflow: openshift-e2e-gcp
187+
- as: e2e-gcp-techpreview
188+
interval: 48h
189+
steps:
190+
cluster_profile: gcp-openshift-gce-devel-ci-2
191+
workflow: openshift-e2e-gcp-techpreview
187192
- as: e2e-gcp-ovn
188193
interval: 24h
189194
steps:
@@ -201,6 +206,11 @@ tests:
201206
steps:
202207
cluster_profile: gcp-openshift-gce-devel-ci-2
203208
workflow: openshift-e2e-gcp-serial
209+
- as: e2e-gcp-techpreview-serial
210+
interval: 48h
211+
steps:
212+
cluster_profile: gcp-openshift-gce-devel-ci-2
213+
workflow: openshift-e2e-gcp-techpreview-serial
204214
- as: e2e-gcp-compact-serial
205215
interval: 48h
206216
steps:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,11 @@ tests:
203203
steps:
204204
cluster_profile: vsphere
205205
workflow: openshift-e2e-vsphere
206+
- as: e2e-vsphere-techpreview
207+
cron: 0 0,6,12,18 * * *
208+
steps:
209+
cluster_profile: vsphere
210+
workflow: openshift-e2e-vsphere-techpreview
206211
- as: e2e-aws-ovn-local-gateway
207212
interval: 48h
208213
steps:
@@ -221,6 +226,11 @@ tests:
221226
steps:
222227
cluster_profile: vsphere
223228
workflow: openshift-e2e-vsphere-serial
229+
- as: e2e-vsphere-techpreview-serial
230+
cron: 30 0,6,12,18 * * *
231+
steps:
232+
cluster_profile: vsphere
233+
workflow: openshift-e2e-vsphere-techpreview-serial
224234
- as: e2e-vsphere-upi
225235
cron: 15 4,10,16,22 * * *
226236
steps:

ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml

Lines changed: 304 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2637,6 +2637,160 @@ periodics:
26372637
- name: result-aggregator
26382638
secret:
26392639
secretName: result-aggregator
2640+
- agent: kubernetes
2641+
cluster: build01
2642+
decorate: true
2643+
decoration_config:
2644+
skip_cloning: true
2645+
extra_refs:
2646+
- base_ref: master
2647+
org: openshift
2648+
repo: release
2649+
interval: 48h
2650+
labels:
2651+
ci-operator.openshift.io/prowgen-controlled: "true"
2652+
ci-operator.openshift.io/variant: ci-4.10
2653+
job-release: "4.10"
2654+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2655+
name: periodic-ci-openshift-release-master-ci-4.10-e2e-gcp-techpreview
2656+
spec:
2657+
containers:
2658+
- args:
2659+
- --gcs-upload-secret=/secrets/gcs/service-account.json
2660+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2661+
- --lease-server-credentials-file=/etc/boskos/credentials
2662+
- --report-credentials-file=/etc/report/credentials
2663+
- --secret-dir=/secrets/ci-pull-credentials
2664+
- --secret-dir=/usr/local/e2e-gcp-techpreview-cluster-profile
2665+
- --target=e2e-gcp-techpreview
2666+
- --variant=ci-4.10
2667+
command:
2668+
- ci-operator
2669+
image: ci-operator:latest
2670+
imagePullPolicy: Always
2671+
name: ""
2672+
resources:
2673+
requests:
2674+
cpu: 10m
2675+
volumeMounts:
2676+
- mountPath: /etc/boskos
2677+
name: boskos
2678+
readOnly: true
2679+
- mountPath: /secrets/ci-pull-credentials
2680+
name: ci-pull-credentials
2681+
readOnly: true
2682+
- mountPath: /usr/local/e2e-gcp-techpreview-cluster-profile
2683+
name: cluster-profile
2684+
- mountPath: /secrets/gcs
2685+
name: gcs-credentials
2686+
readOnly: true
2687+
- mountPath: /etc/pull-secret
2688+
name: pull-secret
2689+
readOnly: true
2690+
- mountPath: /etc/report
2691+
name: result-aggregator
2692+
readOnly: true
2693+
serviceAccountName: ci-operator
2694+
volumes:
2695+
- name: boskos
2696+
secret:
2697+
items:
2698+
- key: credentials
2699+
path: credentials
2700+
secretName: boskos-credentials
2701+
- name: ci-pull-credentials
2702+
secret:
2703+
secretName: ci-pull-credentials
2704+
- name: cluster-profile
2705+
projected:
2706+
sources:
2707+
- secret:
2708+
name: cluster-secrets-gcp-openshift-gce-devel-ci-2
2709+
- configMap:
2710+
name: cluster-profile-gcp-openshift-gce-devel-ci-2
2711+
- name: pull-secret
2712+
secret:
2713+
secretName: registry-pull-credentials
2714+
- name: result-aggregator
2715+
secret:
2716+
secretName: result-aggregator
2717+
- agent: kubernetes
2718+
cluster: build01
2719+
decorate: true
2720+
decoration_config:
2721+
skip_cloning: true
2722+
extra_refs:
2723+
- base_ref: master
2724+
org: openshift
2725+
repo: release
2726+
interval: 48h
2727+
labels:
2728+
ci-operator.openshift.io/prowgen-controlled: "true"
2729+
ci-operator.openshift.io/variant: ci-4.10
2730+
job-release: "4.10"
2731+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2732+
name: periodic-ci-openshift-release-master-ci-4.10-e2e-gcp-techpreview-serial
2733+
spec:
2734+
containers:
2735+
- args:
2736+
- --gcs-upload-secret=/secrets/gcs/service-account.json
2737+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2738+
- --lease-server-credentials-file=/etc/boskos/credentials
2739+
- --report-credentials-file=/etc/report/credentials
2740+
- --secret-dir=/secrets/ci-pull-credentials
2741+
- --secret-dir=/usr/local/e2e-gcp-techpreview-serial-cluster-profile
2742+
- --target=e2e-gcp-techpreview-serial
2743+
- --variant=ci-4.10
2744+
command:
2745+
- ci-operator
2746+
image: ci-operator:latest
2747+
imagePullPolicy: Always
2748+
name: ""
2749+
resources:
2750+
requests:
2751+
cpu: 10m
2752+
volumeMounts:
2753+
- mountPath: /etc/boskos
2754+
name: boskos
2755+
readOnly: true
2756+
- mountPath: /secrets/ci-pull-credentials
2757+
name: ci-pull-credentials
2758+
readOnly: true
2759+
- mountPath: /usr/local/e2e-gcp-techpreview-serial-cluster-profile
2760+
name: cluster-profile
2761+
- mountPath: /secrets/gcs
2762+
name: gcs-credentials
2763+
readOnly: true
2764+
- mountPath: /etc/pull-secret
2765+
name: pull-secret
2766+
readOnly: true
2767+
- mountPath: /etc/report
2768+
name: result-aggregator
2769+
readOnly: true
2770+
serviceAccountName: ci-operator
2771+
volumes:
2772+
- name: boskos
2773+
secret:
2774+
items:
2775+
- key: credentials
2776+
path: credentials
2777+
secretName: boskos-credentials
2778+
- name: ci-pull-credentials
2779+
secret:
2780+
secretName: ci-pull-credentials
2781+
- name: cluster-profile
2782+
projected:
2783+
sources:
2784+
- secret:
2785+
name: cluster-secrets-gcp-openshift-gce-devel-ci-2
2786+
- configMap:
2787+
name: cluster-profile-gcp-openshift-gce-devel-ci-2
2788+
- name: pull-secret
2789+
secret:
2790+
secretName: registry-pull-credentials
2791+
- name: result-aggregator
2792+
secret:
2793+
secretName: result-aggregator
26402794
- agent: kubernetes
26412795
cluster: build01
26422796
decorate: true
@@ -22231,6 +22385,156 @@ periodics:
2223122385
- name: result-aggregator
2223222386
secret:
2223322387
secretName: result-aggregator
22388+
- agent: kubernetes
22389+
cluster: vsphere
22390+
cron: 0 0,6,12,18 * * *
22391+
decorate: true
22392+
decoration_config:
22393+
skip_cloning: true
22394+
extra_refs:
22395+
- base_ref: master
22396+
org: openshift
22397+
repo: release
22398+
labels:
22399+
ci-operator.openshift.io/prowgen-controlled: "true"
22400+
ci-operator.openshift.io/variant: nightly-4.10
22401+
job-release: "4.10"
22402+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
22403+
name: periodic-ci-openshift-release-master-nightly-4.10-e2e-vsphere-techpreview
22404+
spec:
22405+
containers:
22406+
- args:
22407+
- --gcs-upload-secret=/secrets/gcs/service-account.json
22408+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
22409+
- --lease-server-credentials-file=/etc/boskos/credentials
22410+
- --report-credentials-file=/etc/report/credentials
22411+
- --secret-dir=/secrets/ci-pull-credentials
22412+
- --secret-dir=/usr/local/e2e-vsphere-techpreview-cluster-profile
22413+
- --target=e2e-vsphere-techpreview
22414+
- --variant=nightly-4.10
22415+
command:
22416+
- ci-operator
22417+
image: ci-operator:latest
22418+
imagePullPolicy: Always
22419+
name: ""
22420+
resources:
22421+
requests:
22422+
cpu: 10m
22423+
volumeMounts:
22424+
- mountPath: /etc/boskos
22425+
name: boskos
22426+
readOnly: true
22427+
- mountPath: /secrets/ci-pull-credentials
22428+
name: ci-pull-credentials
22429+
readOnly: true
22430+
- mountPath: /usr/local/e2e-vsphere-techpreview-cluster-profile
22431+
name: cluster-profile
22432+
- mountPath: /secrets/gcs
22433+
name: gcs-credentials
22434+
readOnly: true
22435+
- mountPath: /etc/pull-secret
22436+
name: pull-secret
22437+
readOnly: true
22438+
- mountPath: /etc/report
22439+
name: result-aggregator
22440+
readOnly: true
22441+
serviceAccountName: ci-operator
22442+
volumes:
22443+
- name: boskos
22444+
secret:
22445+
items:
22446+
- key: credentials
22447+
path: credentials
22448+
secretName: boskos-credentials
22449+
- name: ci-pull-credentials
22450+
secret:
22451+
secretName: ci-pull-credentials
22452+
- name: cluster-profile
22453+
projected:
22454+
sources:
22455+
- secret:
22456+
name: cluster-secrets-vsphere
22457+
- name: pull-secret
22458+
secret:
22459+
secretName: registry-pull-credentials
22460+
- name: result-aggregator
22461+
secret:
22462+
secretName: result-aggregator
22463+
- agent: kubernetes
22464+
cluster: vsphere
22465+
cron: 30 0,6,12,18 * * *
22466+
decorate: true
22467+
decoration_config:
22468+
skip_cloning: true
22469+
extra_refs:
22470+
- base_ref: master
22471+
org: openshift
22472+
repo: release
22473+
labels:
22474+
ci-operator.openshift.io/prowgen-controlled: "true"
22475+
ci-operator.openshift.io/variant: nightly-4.10
22476+
job-release: "4.10"
22477+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
22478+
name: periodic-ci-openshift-release-master-nightly-4.10-e2e-vsphere-techpreview-serial
22479+
spec:
22480+
containers:
22481+
- args:
22482+
- --gcs-upload-secret=/secrets/gcs/service-account.json
22483+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
22484+
- --lease-server-credentials-file=/etc/boskos/credentials
22485+
- --report-credentials-file=/etc/report/credentials
22486+
- --secret-dir=/secrets/ci-pull-credentials
22487+
- --secret-dir=/usr/local/e2e-vsphere-techpreview-serial-cluster-profile
22488+
- --target=e2e-vsphere-techpreview-serial
22489+
- --variant=nightly-4.10
22490+
command:
22491+
- ci-operator
22492+
image: ci-operator:latest
22493+
imagePullPolicy: Always
22494+
name: ""
22495+
resources:
22496+
requests:
22497+
cpu: 10m
22498+
volumeMounts:
22499+
- mountPath: /etc/boskos
22500+
name: boskos
22501+
readOnly: true
22502+
- mountPath: /secrets/ci-pull-credentials
22503+
name: ci-pull-credentials
22504+
readOnly: true
22505+
- mountPath: /usr/local/e2e-vsphere-techpreview-serial-cluster-profile
22506+
name: cluster-profile
22507+
- mountPath: /secrets/gcs
22508+
name: gcs-credentials
22509+
readOnly: true
22510+
- mountPath: /etc/pull-secret
22511+
name: pull-secret
22512+
readOnly: true
22513+
- mountPath: /etc/report
22514+
name: result-aggregator
22515+
readOnly: true
22516+
serviceAccountName: ci-operator
22517+
volumes:
22518+
- name: boskos
22519+
secret:
22520+
items:
22521+
- key: credentials
22522+
path: credentials
22523+
secretName: boskos-credentials
22524+
- name: ci-pull-credentials
22525+
secret:
22526+
secretName: ci-pull-credentials
22527+
- name: cluster-profile
22528+
projected:
22529+
sources:
22530+
- secret:
22531+
name: cluster-secrets-vsphere
22532+
- name: pull-secret
22533+
secret:
22534+
secretName: registry-pull-credentials
22535+
- name: result-aggregator
22536+
secret:
22537+
secretName: result-aggregator
2223422538
- agent: kubernetes
2223522539
cluster: vsphere
2223622540
cron: 15 4,10,16,22 * * *
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../OWNERS
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"path": "openshift/e2e/gcp/techpreview/openshift-e2e-gcp-techpreview-workflow.yaml",
3+
"owners": {
4+
"approvers": [
5+
"abhinavdahiya",
6+
"jstuever",
7+
"patrickdillon"
8+
]
9+
}
10+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
workflow:
2+
as: openshift-e2e-gcp-techpreview
3+
steps:
4+
pre:
5+
- ref: ipi-conf-techpreview
6+
- chain: ipi-gcp-pre
7+
test:
8+
- ref: openshift-e2e-test
9+
post:
10+
- chain: gather-core-dump
11+
- chain: ipi-gcp-post
12+
documentation: |-
13+
The Openshift E2E GCP workflow executes the common end-to-end test suite on GCP with a TechPreviewNoUpgrade cluster configuration.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../OWNERS

0 commit comments

Comments
 (0)