Skip to content

Commit 3d18501

Browse files
Patryk-StefanskiPatryk-Stefanski
authored
HOSTEDCP-2179: add hypershift-aks-e2e as required presub for csi-operator (openshift#58919)
1 parent c870621 commit 3d18501

6 files changed

+240
-0
lines changed

‎ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,14 @@ tests:
477477
env:
478478
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
479479
workflow: openshift-e2e-azure-csi-file
480+
- as: hypershift-e2e-aks
481+
steps:
482+
cluster_profile: hypershift
483+
env:
484+
AUTH_THROUGH_CERTS: "true"
485+
ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
486+
TECH_PREVIEW_NO_UPGRADE: "true"
487+
workflow: hypershift-azure-aks-e2e
480488
zz_generated_metadata:
481489
branch: main
482490
org: openshift

‎ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,14 @@ tests:
479479
env:
480480
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
481481
workflow: openshift-e2e-azure-csi-file
482+
- as: hypershift-e2e-aks
483+
steps:
484+
cluster_profile: hypershift
485+
env:
486+
AUTH_THROUGH_CERTS: "true"
487+
ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
488+
TECH_PREVIEW_NO_UPGRADE: "true"
489+
workflow: hypershift-azure-aks-e2e
482490
zz_generated_metadata:
483491
branch: release-4.18
484492
org: openshift

‎ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,14 @@ tests:
447447
env:
448448
PROJECT_NAME: csi-operator
449449
workflow: openshift-ci-security
450+
- as: hypershift-e2e-aks
451+
steps:
452+
cluster_profile: hypershift
453+
env:
454+
AUTH_THROUGH_CERTS: "true"
455+
ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
456+
TECH_PREVIEW_NO_UPGRADE: "true"
457+
workflow: hypershift-azure-aks-e2e
450458
zz_generated_metadata:
451459
branch: release-4.19
452460
org: openshift

‎ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-main-presubmits.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -1420,6 +1420,78 @@ presubmits:
14201420
secret:
14211421
secretName: result-aggregator
14221422
trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
1423+
- agent: kubernetes
1424+
always_run: true
1425+
branches:
1426+
- ^main$
1427+
- ^main-
1428+
cluster: build03
1429+
context: ci/prow/hypershift-e2e-aks
1430+
decorate: true
1431+
labels:
1432+
ci-operator.openshift.io/cloud: hypershift
1433+
ci-operator.openshift.io/cloud-cluster-profile: hypershift
1434+
ci.openshift.io/generator: prowgen
1435+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1436+
name: pull-ci-openshift-csi-operator-main-hypershift-e2e-aks
1437+
rerun_command: /test hypershift-e2e-aks
1438+
spec:
1439+
containers:
1440+
- args:
1441+
- --gcs-upload-secret=/secrets/gcs/service-account.json
1442+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
1443+
- --lease-server-credentials-file=/etc/boskos/credentials
1444+
- --report-credentials-file=/etc/report/credentials
1445+
- --secret-dir=/secrets/ci-pull-credentials
1446+
- --target=hypershift-e2e-aks
1447+
command:
1448+
- ci-operator
1449+
image: ci-operator:latest
1450+
imagePullPolicy: Always
1451+
name: ""
1452+
resources:
1453+
requests:
1454+
cpu: 10m
1455+
volumeMounts:
1456+
- mountPath: /etc/boskos
1457+
name: boskos
1458+
readOnly: true
1459+
- mountPath: /secrets/ci-pull-credentials
1460+
name: ci-pull-credentials
1461+
readOnly: true
1462+
- mountPath: /secrets/gcs
1463+
name: gcs-credentials
1464+
readOnly: true
1465+
- mountPath: /secrets/manifest-tool
1466+
name: manifest-tool-local-pusher
1467+
readOnly: true
1468+
- mountPath: /etc/pull-secret
1469+
name: pull-secret
1470+
readOnly: true
1471+
- mountPath: /etc/report
1472+
name: result-aggregator
1473+
readOnly: true
1474+
serviceAccountName: ci-operator
1475+
volumes:
1476+
- name: boskos
1477+
secret:
1478+
items:
1479+
- key: credentials
1480+
path: credentials
1481+
secretName: boskos-credentials
1482+
- name: ci-pull-credentials
1483+
secret:
1484+
secretName: ci-pull-credentials
1485+
- name: manifest-tool-local-pusher
1486+
secret:
1487+
secretName: manifest-tool-local-pusher
1488+
- name: pull-secret
1489+
secret:
1490+
secretName: registry-pull-credentials
1491+
- name: result-aggregator
1492+
secret:
1493+
secretName: result-aggregator
1494+
trigger: (?m)^/test( | .* )hypershift-e2e-aks,?($|\s.*)
14231495
- agent: kubernetes
14241496
always_run: false
14251497
branches:

‎ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -1420,6 +1420,78 @@ presubmits:
14201420
secret:
14211421
secretName: result-aggregator
14221422
trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
1423+
- agent: kubernetes
1424+
always_run: true
1425+
branches:
1426+
- ^release-4\.18$
1427+
- ^release-4\.18-
1428+
cluster: build05
1429+
context: ci/prow/hypershift-e2e-aks
1430+
decorate: true
1431+
labels:
1432+
ci-operator.openshift.io/cloud: hypershift
1433+
ci-operator.openshift.io/cloud-cluster-profile: hypershift
1434+
ci.openshift.io/generator: prowgen
1435+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1436+
name: pull-ci-openshift-csi-operator-release-4.18-hypershift-e2e-aks
1437+
rerun_command: /test hypershift-e2e-aks
1438+
spec:
1439+
containers:
1440+
- args:
1441+
- --gcs-upload-secret=/secrets/gcs/service-account.json
1442+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
1443+
- --lease-server-credentials-file=/etc/boskos/credentials
1444+
- --report-credentials-file=/etc/report/credentials
1445+
- --secret-dir=/secrets/ci-pull-credentials
1446+
- --target=hypershift-e2e-aks
1447+
command:
1448+
- ci-operator
1449+
image: ci-operator:latest
1450+
imagePullPolicy: Always
1451+
name: ""
1452+
resources:
1453+
requests:
1454+
cpu: 10m
1455+
volumeMounts:
1456+
- mountPath: /etc/boskos
1457+
name: boskos
1458+
readOnly: true
1459+
- mountPath: /secrets/ci-pull-credentials
1460+
name: ci-pull-credentials
1461+
readOnly: true
1462+
- mountPath: /secrets/gcs
1463+
name: gcs-credentials
1464+
readOnly: true
1465+
- mountPath: /secrets/manifest-tool
1466+
name: manifest-tool-local-pusher
1467+
readOnly: true
1468+
- mountPath: /etc/pull-secret
1469+
name: pull-secret
1470+
readOnly: true
1471+
- mountPath: /etc/report
1472+
name: result-aggregator
1473+
readOnly: true
1474+
serviceAccountName: ci-operator
1475+
volumes:
1476+
- name: boskos
1477+
secret:
1478+
items:
1479+
- key: credentials
1480+
path: credentials
1481+
secretName: boskos-credentials
1482+
- name: ci-pull-credentials
1483+
secret:
1484+
secretName: ci-pull-credentials
1485+
- name: manifest-tool-local-pusher
1486+
secret:
1487+
secretName: manifest-tool-local-pusher
1488+
- name: pull-secret
1489+
secret:
1490+
secretName: registry-pull-credentials
1491+
- name: result-aggregator
1492+
secret:
1493+
secretName: result-aggregator
1494+
trigger: (?m)^/test( | .* )hypershift-e2e-aks,?($|\s.*)
14231495
- agent: kubernetes
14241496
always_run: false
14251497
branches:

‎ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -1420,6 +1420,78 @@ presubmits:
14201420
secret:
14211421
secretName: result-aggregator
14221422
trigger: (?m)^/test( | .* )hypershift-aws-e2e-external,?($|\s.*)
1423+
- agent: kubernetes
1424+
always_run: true
1425+
branches:
1426+
- ^release-4\.19$
1427+
- ^release-4\.19-
1428+
cluster: build05
1429+
context: ci/prow/hypershift-e2e-aks
1430+
decorate: true
1431+
labels:
1432+
ci-operator.openshift.io/cloud: hypershift
1433+
ci-operator.openshift.io/cloud-cluster-profile: hypershift
1434+
ci.openshift.io/generator: prowgen
1435+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1436+
name: pull-ci-openshift-csi-operator-release-4.19-hypershift-e2e-aks
1437+
rerun_command: /test hypershift-e2e-aks
1438+
spec:
1439+
containers:
1440+
- args:
1441+
- --gcs-upload-secret=/secrets/gcs/service-account.json
1442+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
1443+
- --lease-server-credentials-file=/etc/boskos/credentials
1444+
- --report-credentials-file=/etc/report/credentials
1445+
- --secret-dir=/secrets/ci-pull-credentials
1446+
- --target=hypershift-e2e-aks
1447+
command:
1448+
- ci-operator
1449+
image: ci-operator:latest
1450+
imagePullPolicy: Always
1451+
name: ""
1452+
resources:
1453+
requests:
1454+
cpu: 10m
1455+
volumeMounts:
1456+
- mountPath: /etc/boskos
1457+
name: boskos
1458+
readOnly: true
1459+
- mountPath: /secrets/ci-pull-credentials
1460+
name: ci-pull-credentials
1461+
readOnly: true
1462+
- mountPath: /secrets/gcs
1463+
name: gcs-credentials
1464+
readOnly: true
1465+
- mountPath: /secrets/manifest-tool
1466+
name: manifest-tool-local-pusher
1467+
readOnly: true
1468+
- mountPath: /etc/pull-secret
1469+
name: pull-secret
1470+
readOnly: true
1471+
- mountPath: /etc/report
1472+
name: result-aggregator
1473+
readOnly: true
1474+
serviceAccountName: ci-operator
1475+
volumes:
1476+
- name: boskos
1477+
secret:
1478+
items:
1479+
- key: credentials
1480+
path: credentials
1481+
secretName: boskos-credentials
1482+
- name: ci-pull-credentials
1483+
secret:
1484+
secretName: ci-pull-credentials
1485+
- name: manifest-tool-local-pusher
1486+
secret:
1487+
secretName: manifest-tool-local-pusher
1488+
- name: pull-secret
1489+
secret:
1490+
secretName: registry-pull-credentials
1491+
- name: result-aggregator
1492+
secret:
1493+
secretName: result-aggregator
1494+
trigger: (?m)^/test( | .* )hypershift-e2e-aks,?($|\s.*)
14231495
- agent: kubernetes
14241496
always_run: false
14251497
branches:

0 commit comments

Comments
 (0)