diff --git a/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master.yaml b/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master.yaml index 63244b2d7cf0b..c760ef5bc4df3 100644 --- a/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master.yaml +++ b/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master.yaml @@ -44,7 +44,7 @@ tests: cluster_profile: aro-classic-int env: E2E_TYPE: miwi - LOCATION: uksouth + LOCATION: eastus workflow: aro-classic-e2e - always_run: false as: stage-e2e-parallel-miwi @@ -53,7 +53,7 @@ tests: cluster_profile: aro-classic-stg env: E2E_TYPE: miwi - LOCATION: uksouth + LOCATION: westus2 workflow: aro-classic-e2e - always_run: false as: prod-e2e-parallel-miwi @@ -79,7 +79,7 @@ tests: cluster_profile: aro-classic-int env: E2E_TYPE: csp - LOCATION: uksouth + LOCATION: eastus workflow: aro-classic-e2e - always_run: false as: stage-e2e-parallel-csp @@ -88,7 +88,7 @@ tests: cluster_profile: aro-classic-stg env: E2E_TYPE: csp - LOCATION: uksouth + LOCATION: westus2 workflow: aro-classic-e2e - always_run: false as: prod-e2e-parallel-csp diff --git a/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__e2e.yaml b/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__e2e.yaml new file mode 100644 index 0000000000000..3dbb22d3feb5c --- /dev/null +++ b/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__e2e.yaml @@ -0,0 +1,82 @@ +base_images: + aro-classic-e2e: + name: aro-classic-ci-images + namespace: aro-classic + tag: aro-classic-e2e +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.25 +releases: + latest: + integration: + name: "4.22" + namespace: ocp +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: integration-e2e-parallel-miwi + postsubmit: true + run_if_changed: ^$ + steps: + cluster_profile: aro-classic-int + env: + E2E_TYPE: miwi + LOCATION: eastus + workflow: aro-classic-e2e +- as: stage-e2e-parallel-miwi + postsubmit: true + run_if_changed: ^$ + steps: + cluster_profile: aro-classic-stg + env: + E2E_TYPE: miwi + LOCATION: westus2 + workflow: aro-classic-e2e +- as: prod-e2e-parallel-miwi + postsubmit: true + run_if_changed: ^$ + steps: + cluster_profile: aro-classic-prod + env: + E2E_TYPE: miwi + LOCATION: uksouth + workflow: aro-classic-e2e +- as: integration-e2e-parallel-csp + postsubmit: true + run_if_changed: ^$ + steps: + cluster_profile: aro-classic-int + env: + E2E_TYPE: csp + LOCATION: eastus + workflow: aro-classic-e2e +- as: stage-e2e-parallel-csp + postsubmit: true + run_if_changed: ^$ + steps: + cluster_profile: aro-classic-stg + env: + E2E_TYPE: csp + LOCATION: westus2 + workflow: aro-classic-e2e +- as: prod-e2e-parallel-csp + postsubmit: true + run_if_changed: ^$ + steps: + cluster_profile: aro-classic-prod + env: + E2E_TYPE: csp + LOCATION: uksouth + workflow: aro-classic-e2e +zz_generated_metadata: + branch: master + org: Azure + repo: ARO-RP + variant: e2e diff --git a/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__periodic.yaml b/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__periodic.yaml index d12754f2baf30..16aa9f468f0ce 100644 --- a/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__periodic.yaml +++ b/ci-operator/config/Azure/ARO-RP/Azure-ARO-RP-master__periodic.yaml @@ -28,7 +28,7 @@ tests: cluster_profile: aro-classic-int env: E2E_TYPE: miwi - LOCATION: uksouth + LOCATION: eastus workflow: aro-classic-e2e - always_run: false as: stage-e2e-parallel-miwi @@ -37,7 +37,7 @@ tests: cluster_profile: aro-classic-stg env: E2E_TYPE: miwi - LOCATION: uksouth + LOCATION: westus2 workflow: aro-classic-e2e - always_run: false as: prod-e2e-parallel-miwi @@ -55,7 +55,7 @@ tests: cluster_profile: aro-classic-int env: E2E_TYPE: csp - LOCATION: uksouth + LOCATION: eastus workflow: aro-classic-e2e - always_run: false as: stage-e2e-parallel-csp @@ -64,7 +64,7 @@ tests: cluster_profile: aro-classic-stg env: E2E_TYPE: csp - LOCATION: uksouth + LOCATION: westus2 workflow: aro-classic-e2e - always_run: false as: prod-e2e-parallel-csp diff --git a/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-postsubmits.yaml b/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-postsubmits.yaml index 82bc34bc84685..5a353513742e2 100644 --- a/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-postsubmits.yaml +++ b/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-postsubmits.yaml @@ -1,5 +1,491 @@ postsubmits: Azure/ARO-RP: + - agent: kubernetes + always_run: false + branches: + - ^master$ + cluster: build08 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-int + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-int + ci-operator.openshift.io/variant: e2e + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-Azure-ARO-RP-master-e2e-integration-e2e-parallel-csp + run_if_changed: ^$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=integration-e2e-parallel-csp + - --variant=e2e + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + - agent: kubernetes + always_run: false + branches: + - ^master$ + cluster: build08 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-int + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-int + ci-operator.openshift.io/variant: e2e + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-Azure-ARO-RP-master-e2e-integration-e2e-parallel-miwi + run_if_changed: ^$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=integration-e2e-parallel-miwi + - --variant=e2e + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + - agent: kubernetes + always_run: false + branches: + - ^master$ + cluster: build08 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-prod + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-prod + ci-operator.openshift.io/variant: e2e + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-Azure-ARO-RP-master-e2e-prod-e2e-parallel-csp + run_if_changed: ^$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=prod-e2e-parallel-csp + - --variant=e2e + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + - agent: kubernetes + always_run: false + branches: + - ^master$ + cluster: build08 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-prod + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-prod + ci-operator.openshift.io/variant: e2e + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-Azure-ARO-RP-master-e2e-prod-e2e-parallel-miwi + run_if_changed: ^$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=prod-e2e-parallel-miwi + - --variant=e2e + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + - agent: kubernetes + always_run: false + branches: + - ^master$ + cluster: build08 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-stg + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-stg + ci-operator.openshift.io/variant: e2e + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-Azure-ARO-RP-master-e2e-stage-e2e-parallel-csp + run_if_changed: ^$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=stage-e2e-parallel-csp + - --variant=e2e + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + - agent: kubernetes + always_run: false + branches: + - ^master$ + cluster: build08 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-stg + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-stg + ci-operator.openshift.io/variant: e2e + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-Azure-ARO-RP-master-e2e-stage-e2e-parallel-miwi + run_if_changed: ^$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=stage-e2e-parallel-miwi + - --variant=e2e + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes always_run: true branches: