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 88e4a64d13a5f..63244b2d7cf0b 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 @@ -38,34 +38,73 @@ resources: memory: 200Mi tests: - always_run: false - as: integration-e2e-parallel + as: integration-e2e-parallel-miwi optional: true steps: cluster_profile: aro-classic-int env: + E2E_TYPE: miwi LOCATION: uksouth workflow: aro-classic-e2e - always_run: false - as: stage-e2e-parallel + as: stage-e2e-parallel-miwi optional: true steps: cluster_profile: aro-classic-stg env: + E2E_TYPE: miwi LOCATION: uksouth workflow: aro-classic-e2e - always_run: false - as: prod-e2e-parallel + as: prod-e2e-parallel-miwi optional: true steps: cluster_profile: aro-classic-prod env: + E2E_TYPE: miwi LOCATION: uksouth workflow: aro-classic-e2e - always_run: false - as: e2e-parallel + as: e2e-parallel-miwi steps: cluster_profile: aro-classic-dev env: + E2E_TYPE: miwi + LOCATION: westus3 + workflow: aro-classic-e2e +- always_run: false + as: integration-e2e-parallel-csp + optional: true + steps: + cluster_profile: aro-classic-int + env: + E2E_TYPE: csp + LOCATION: uksouth + workflow: aro-classic-e2e +- always_run: false + as: stage-e2e-parallel-csp + optional: true + steps: + cluster_profile: aro-classic-stg + env: + E2E_TYPE: csp + LOCATION: uksouth + workflow: aro-classic-e2e +- always_run: false + as: prod-e2e-parallel-csp + optional: true + steps: + cluster_profile: aro-classic-prod + env: + E2E_TYPE: csp + LOCATION: uksouth + workflow: aro-classic-e2e +- always_run: false + as: e2e-parallel-csp + steps: + cluster_profile: aro-classic-dev + env: + E2E_TYPE: csp LOCATION: westus3 workflow: aro-classic-e2e zz_generated_metadata: 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 8e681d4ca3376..d12754f2baf30 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 @@ -22,27 +22,57 @@ resources: memory: 200Mi tests: - always_run: false - as: integration-e2e-parallel + as: integration-e2e-parallel-miwi cron: 0 0 1 1 * steps: cluster_profile: aro-classic-int env: + E2E_TYPE: miwi LOCATION: uksouth workflow: aro-classic-e2e - always_run: false - as: stage-e2e-parallel + as: stage-e2e-parallel-miwi cron: 0 0 1 1 * steps: cluster_profile: aro-classic-stg env: + E2E_TYPE: miwi LOCATION: uksouth workflow: aro-classic-e2e - always_run: false - as: prod-e2e-parallel + as: prod-e2e-parallel-miwi cron: 0 0 1 1 * steps: cluster_profile: aro-classic-prod env: + E2E_TYPE: miwi + LOCATION: uksouth + workflow: aro-classic-e2e +- always_run: false + as: integration-e2e-parallel-csp + cron: 0 0 1 1 * + steps: + cluster_profile: aro-classic-int + env: + E2E_TYPE: csp + LOCATION: uksouth + workflow: aro-classic-e2e +- always_run: false + as: stage-e2e-parallel-csp + cron: 0 0 1 1 * + steps: + cluster_profile: aro-classic-stg + env: + E2E_TYPE: csp + LOCATION: uksouth + workflow: aro-classic-e2e +- always_run: false + as: prod-e2e-parallel-csp + cron: 0 0 1 1 * + steps: + cluster_profile: aro-classic-prod + env: + E2E_TYPE: csp LOCATION: uksouth workflow: aro-classic-e2e zz_generated_metadata: diff --git a/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-periodics.yaml b/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-periodics.yaml index ffcc295b22e69..cf134312807dc 100644 --- a/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-periodics.yaml +++ b/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-periodics.yaml @@ -15,7 +15,7 @@ periodics: ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-Azure-ARO-RP-master-periodic-integration-e2e-parallel + name: periodic-ci-Azure-ARO-RP-master-periodic-integration-e2e-parallel-csp spec: containers: - args: @@ -24,7 +24,171 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=integration-e2e-parallel + - --target=integration-e2e-parallel-csp + - --variant=periodic + 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 + cluster: build06 + cron: 0 0 1 1 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: Azure + repo: ARO-RP + labels: + ci-operator.openshift.io/cloud: aro-classic-int + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-int + ci-operator.openshift.io/variant: periodic + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-Azure-ARO-RP-master-periodic-integration-e2e-parallel-miwi + 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=periodic + 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 + cluster: build06 + cron: 0 0 1 1 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: Azure + repo: ARO-RP + labels: + ci-operator.openshift.io/cloud: aro-classic-prod + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-prod + ci-operator.openshift.io/variant: periodic + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-Azure-ARO-RP-master-periodic-prod-e2e-parallel-csp + 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=periodic command: - ci-operator @@ -97,7 +261,89 @@ periodics: ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-Azure-ARO-RP-master-periodic-prod-e2e-parallel + name: periodic-ci-Azure-ARO-RP-master-periodic-prod-e2e-parallel-miwi + 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=periodic + 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 + cluster: build06 + cron: 0 0 1 1 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: Azure + repo: ARO-RP + labels: + ci-operator.openshift.io/cloud: aro-classic-stg + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-stg + ci-operator.openshift.io/variant: periodic + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-Azure-ARO-RP-master-periodic-stage-e2e-parallel-csp spec: containers: - args: @@ -106,7 +352,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=prod-e2e-parallel + - --target=stage-e2e-parallel-csp - --variant=periodic command: - ci-operator @@ -179,7 +425,7 @@ periodics: ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-Azure-ARO-RP-master-periodic-stage-e2e-parallel + name: periodic-ci-Azure-ARO-RP-master-periodic-stage-e2e-parallel-miwi spec: containers: - args: @@ -188,7 +434,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=stage-e2e-parallel + - --target=stage-e2e-parallel-miwi - --variant=periodic command: - ci-operator diff --git a/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-presubmits.yaml b/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-presubmits.yaml index 1dbfd267f32b2..99ca2dc90f8b5 100644 --- a/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-presubmits.yaml +++ b/ci-operator/jobs/Azure/ARO-RP/Azure-ARO-RP-master-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^master$ - ^master- cluster: build11 - context: ci/prow/e2e-parallel + context: ci/prow/e2e-parallel-csp decorate: true decoration_config: skip_cloning: true @@ -15,8 +15,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aro-classic-dev ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-Azure-ARO-RP-master-e2e-parallel - rerun_command: /test e2e-parallel + name: pull-ci-Azure-ARO-RP-master-e2e-parallel-csp + rerun_command: /test e2e-parallel-csp spec: containers: - args: @@ -25,7 +25,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-parallel + - --target=e2e-parallel-csp command: - ci-operator env: @@ -81,7 +81,89 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(e2e-parallel|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(e2e-parallel-csp|remaining-required),?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/e2e-parallel-miwi + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aro-classic-dev + ci-operator.openshift.io/cloud-cluster-profile: aro-classic-dev + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-Azure-ARO-RP-master-e2e-parallel-miwi + rerun_command: /test e2e-parallel-miwi + 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=e2e-parallel-miwi + 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 + trigger: (?m)^/test( | .* )(e2e-parallel-miwi|remaining-required),?($|\s.*) - agent: kubernetes always_run: true branches: @@ -143,7 +225,90 @@ presubmits: - ^master$ - ^master- cluster: build11 - context: ci/prow/integration-e2e-parallel + context: ci/prow/integration-e2e-parallel-csp + 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.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-Azure-ARO-RP-master-integration-e2e-parallel-csp + optional: true + rerun_command: /test integration-e2e-parallel-csp + 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 + 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 + trigger: (?m)^/test( | .* )integration-e2e-parallel-csp,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/integration-e2e-parallel-miwi decorate: true decoration_config: skip_cloning: true @@ -152,9 +317,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aro-classic-int ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-Azure-ARO-RP-master-integration-e2e-parallel + name: pull-ci-Azure-ARO-RP-master-integration-e2e-parallel-miwi optional: true - rerun_command: /test integration-e2e-parallel + rerun_command: /test integration-e2e-parallel-miwi spec: containers: - args: @@ -163,7 +328,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=integration-e2e-parallel + - --target=integration-e2e-parallel-miwi command: - ci-operator env: @@ -219,14 +384,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )integration-e2e-parallel,?($|\s.*) + trigger: (?m)^/test( | .* )integration-e2e-parallel-miwi,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build11 - context: ci/prow/prod-e2e-parallel + context: ci/prow/prod-e2e-parallel-csp decorate: true decoration_config: skip_cloning: true @@ -235,9 +400,175 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aro-classic-prod ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-Azure-ARO-RP-master-prod-e2e-parallel + name: pull-ci-Azure-ARO-RP-master-prod-e2e-parallel-csp + optional: true + rerun_command: /test prod-e2e-parallel-csp + 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 + 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 + trigger: (?m)^/test( | .* )prod-e2e-parallel-csp,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/prod-e2e-parallel-miwi + 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.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-Azure-ARO-RP-master-prod-e2e-parallel-miwi + optional: true + rerun_command: /test prod-e2e-parallel-miwi + 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 + 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 + trigger: (?m)^/test( | .* )prod-e2e-parallel-miwi,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/stage-e2e-parallel-csp + 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.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-Azure-ARO-RP-master-stage-e2e-parallel-csp optional: true - rerun_command: /test prod-e2e-parallel + rerun_command: /test stage-e2e-parallel-csp spec: containers: - args: @@ -246,7 +577,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=prod-e2e-parallel + - --target=stage-e2e-parallel-csp command: - ci-operator env: @@ -302,14 +633,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )prod-e2e-parallel,?($|\s.*) + trigger: (?m)^/test( | .* )stage-e2e-parallel-csp,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build11 - context: ci/prow/stage-e2e-parallel + context: ci/prow/stage-e2e-parallel-miwi decorate: true decoration_config: skip_cloning: true @@ -318,9 +649,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aro-classic-stg ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-Azure-ARO-RP-master-stage-e2e-parallel + name: pull-ci-Azure-ARO-RP-master-stage-e2e-parallel-miwi optional: true - rerun_command: /test stage-e2e-parallel + rerun_command: /test stage-e2e-parallel-miwi spec: containers: - args: @@ -329,7 +660,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=stage-e2e-parallel + - --target=stage-e2e-parallel-miwi command: - ci-operator env: @@ -385,4 +716,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )stage-e2e-parallel,?($|\s.*) + trigger: (?m)^/test( | .* )stage-e2e-parallel-miwi,?($|\s.*) diff --git a/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-commands.sh b/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-commands.sh index 05ffb8e8ec37c..bd0793c4c8229 100644 --- a/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-commands.sh +++ b/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-commands.sh @@ -15,6 +15,14 @@ az account set --subscription "${AZURE_SUBSCRIPTION_ID}" AZURE_FP_CLIENT_ID=$(cat "${CLUSTER_PROFILE_DIR}/fp-client-id") export AZURE_FP_SERVICE_PRINCIPAL_ID; AZURE_FP_SERVICE_PRINCIPAL_ID=$(az ad sp show --id "${AZURE_FP_CLIENT_ID}" --query "id" -o tsv) +export E2E_TYPE; E2E_TYPE="${E2E_TYPE:=csp}" + +if [[ "${E2E_TYPE}" == "miwi" ]]; then + export USE_WI="true" +else + export USE_WI="false" +fi + export LOCATION; LOCATION="${LOCATION:=${LEASED_RESOURCE}}" if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_LOCATION:-}" ]]; then LOCATION="${MULTISTAGE_PARAM_OVERRIDE_LOCATION}" diff --git a/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-ref.yaml b/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-ref.yaml index 2eb24831c62f9..511d64baa23c2 100644 --- a/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-ref.yaml +++ b/ci-operator/step-registry/aro-classic/test/persistent/aro-classic-test-persistent-ref.yaml @@ -16,5 +16,10 @@ ref: - name: MULTISTAGE_PARAM_OVERRIDE_LOCATION default: "" documentation: Overrides LOCATION via Gangway API. + That way we can have tests that choose different locations. + - name: E2E_TYPE + default: "csp" + documentation: |- + Type of end-to-end test to run. For example, "csp" or "miwi". documentation: |- Run the Azure/ARO-RP/e2e binary. diff --git a/core-services/prow/02_config/_boskos.yaml b/core-services/prow/02_config/_boskos.yaml index a41cb004fbe62..46bba51653d8c 100644 --- a/core-services/prow/02_config/_boskos.yaml +++ b/core-services/prow/02_config/_boskos.yaml @@ -55,6 +55,165 @@ resources: min-count: 5 state: free type: aro-classic-stg-quota-slice +- names: + - aro-classic-test-msi-containers-int-0 + - aro-classic-test-msi-containers-int-1 + - aro-classic-test-msi-containers-int-10 + - aro-classic-test-msi-containers-int-11 + - aro-classic-test-msi-containers-int-12 + - aro-classic-test-msi-containers-int-13 + - aro-classic-test-msi-containers-int-14 + - aro-classic-test-msi-containers-int-15 + - aro-classic-test-msi-containers-int-16 + - aro-classic-test-msi-containers-int-17 + - aro-classic-test-msi-containers-int-18 + - aro-classic-test-msi-containers-int-19 + - aro-classic-test-msi-containers-int-2 + - aro-classic-test-msi-containers-int-20 + - aro-classic-test-msi-containers-int-21 + - aro-classic-test-msi-containers-int-22 + - aro-classic-test-msi-containers-int-23 + - aro-classic-test-msi-containers-int-24 + - aro-classic-test-msi-containers-int-25 + - aro-classic-test-msi-containers-int-26 + - aro-classic-test-msi-containers-int-27 + - aro-classic-test-msi-containers-int-28 + - aro-classic-test-msi-containers-int-29 + - aro-classic-test-msi-containers-int-3 + - aro-classic-test-msi-containers-int-30 + - aro-classic-test-msi-containers-int-31 + - aro-classic-test-msi-containers-int-32 + - aro-classic-test-msi-containers-int-33 + - aro-classic-test-msi-containers-int-34 + - aro-classic-test-msi-containers-int-35 + - aro-classic-test-msi-containers-int-36 + - aro-classic-test-msi-containers-int-37 + - aro-classic-test-msi-containers-int-38 + - aro-classic-test-msi-containers-int-39 + - aro-classic-test-msi-containers-int-4 + - aro-classic-test-msi-containers-int-40 + - aro-classic-test-msi-containers-int-41 + - aro-classic-test-msi-containers-int-42 + - aro-classic-test-msi-containers-int-43 + - aro-classic-test-msi-containers-int-44 + - aro-classic-test-msi-containers-int-45 + - aro-classic-test-msi-containers-int-46 + - aro-classic-test-msi-containers-int-47 + - aro-classic-test-msi-containers-int-48 + - aro-classic-test-msi-containers-int-49 + - aro-classic-test-msi-containers-int-5 + - aro-classic-test-msi-containers-int-6 + - aro-classic-test-msi-containers-int-7 + - aro-classic-test-msi-containers-int-8 + - aro-classic-test-msi-containers-int-9 + state: free + type: aro-classic-test-msi-containers-int +- names: + - aro-classic-test-msi-containers-prod-0 + - aro-classic-test-msi-containers-prod-1 + - aro-classic-test-msi-containers-prod-10 + - aro-classic-test-msi-containers-prod-11 + - aro-classic-test-msi-containers-prod-12 + - aro-classic-test-msi-containers-prod-13 + - aro-classic-test-msi-containers-prod-14 + - aro-classic-test-msi-containers-prod-15 + - aro-classic-test-msi-containers-prod-16 + - aro-classic-test-msi-containers-prod-17 + - aro-classic-test-msi-containers-prod-18 + - aro-classic-test-msi-containers-prod-19 + - aro-classic-test-msi-containers-prod-2 + - aro-classic-test-msi-containers-prod-20 + - aro-classic-test-msi-containers-prod-21 + - aro-classic-test-msi-containers-prod-22 + - aro-classic-test-msi-containers-prod-23 + - aro-classic-test-msi-containers-prod-24 + - aro-classic-test-msi-containers-prod-25 + - aro-classic-test-msi-containers-prod-26 + - aro-classic-test-msi-containers-prod-27 + - aro-classic-test-msi-containers-prod-28 + - aro-classic-test-msi-containers-prod-29 + - aro-classic-test-msi-containers-prod-3 + - aro-classic-test-msi-containers-prod-30 + - aro-classic-test-msi-containers-prod-31 + - aro-classic-test-msi-containers-prod-32 + - aro-classic-test-msi-containers-prod-33 + - aro-classic-test-msi-containers-prod-34 + - aro-classic-test-msi-containers-prod-35 + - aro-classic-test-msi-containers-prod-36 + - aro-classic-test-msi-containers-prod-37 + - aro-classic-test-msi-containers-prod-38 + - aro-classic-test-msi-containers-prod-39 + - aro-classic-test-msi-containers-prod-4 + - aro-classic-test-msi-containers-prod-40 + - aro-classic-test-msi-containers-prod-41 + - aro-classic-test-msi-containers-prod-42 + - aro-classic-test-msi-containers-prod-43 + - aro-classic-test-msi-containers-prod-44 + - aro-classic-test-msi-containers-prod-45 + - aro-classic-test-msi-containers-prod-46 + - aro-classic-test-msi-containers-prod-47 + - aro-classic-test-msi-containers-prod-48 + - aro-classic-test-msi-containers-prod-49 + - aro-classic-test-msi-containers-prod-5 + - aro-classic-test-msi-containers-prod-6 + - aro-classic-test-msi-containers-prod-7 + - aro-classic-test-msi-containers-prod-8 + - aro-classic-test-msi-containers-prod-9 + state: free + type: aro-classic-test-msi-containers-prod +- names: + - aro-classic-test-msi-containers-stg-0 + - aro-classic-test-msi-containers-stg-1 + - aro-classic-test-msi-containers-stg-10 + - aro-classic-test-msi-containers-stg-11 + - aro-classic-test-msi-containers-stg-12 + - aro-classic-test-msi-containers-stg-13 + - aro-classic-test-msi-containers-stg-14 + - aro-classic-test-msi-containers-stg-15 + - aro-classic-test-msi-containers-stg-16 + - aro-classic-test-msi-containers-stg-17 + - aro-classic-test-msi-containers-stg-18 + - aro-classic-test-msi-containers-stg-19 + - aro-classic-test-msi-containers-stg-2 + - aro-classic-test-msi-containers-stg-20 + - aro-classic-test-msi-containers-stg-21 + - aro-classic-test-msi-containers-stg-22 + - aro-classic-test-msi-containers-stg-23 + - aro-classic-test-msi-containers-stg-24 + - aro-classic-test-msi-containers-stg-25 + - aro-classic-test-msi-containers-stg-26 + - aro-classic-test-msi-containers-stg-27 + - aro-classic-test-msi-containers-stg-28 + - aro-classic-test-msi-containers-stg-29 + - aro-classic-test-msi-containers-stg-3 + - aro-classic-test-msi-containers-stg-30 + - aro-classic-test-msi-containers-stg-31 + - aro-classic-test-msi-containers-stg-32 + - aro-classic-test-msi-containers-stg-33 + - aro-classic-test-msi-containers-stg-34 + - aro-classic-test-msi-containers-stg-35 + - aro-classic-test-msi-containers-stg-36 + - aro-classic-test-msi-containers-stg-37 + - aro-classic-test-msi-containers-stg-38 + - aro-classic-test-msi-containers-stg-39 + - aro-classic-test-msi-containers-stg-4 + - aro-classic-test-msi-containers-stg-40 + - aro-classic-test-msi-containers-stg-41 + - aro-classic-test-msi-containers-stg-42 + - aro-classic-test-msi-containers-stg-43 + - aro-classic-test-msi-containers-stg-44 + - aro-classic-test-msi-containers-stg-45 + - aro-classic-test-msi-containers-stg-46 + - aro-classic-test-msi-containers-stg-47 + - aro-classic-test-msi-containers-stg-48 + - aro-classic-test-msi-containers-stg-49 + - aro-classic-test-msi-containers-stg-5 + - aro-classic-test-msi-containers-stg-6 + - aro-classic-test-msi-containers-stg-7 + - aro-classic-test-msi-containers-stg-8 + - aro-classic-test-msi-containers-stg-9 + state: free + type: aro-classic-test-msi-containers-stg - max-count: 1 min-count: 1 state: free diff --git a/core-services/prow/02_config/generate-boskos.py b/core-services/prow/02_config/generate-boskos.py index 5fa1e971401ac..63e1f5bda34fa 100755 --- a/core-services/prow/02_config/generate-boskos.py +++ b/core-services/prow/02_config/generate-boskos.py @@ -276,6 +276,9 @@ 'aro-classic-prod-quota-slice': { 'default': 30 }, + 'aro-classic-test-msi-containers-int': {}, + 'aro-classic-test-msi-containers-stg': {}, + 'aro-classic-test-msi-containers-prod': {}, 'aro-hcp-int-quota-slice': { 'default': 1, }, @@ -749,6 +752,11 @@ for i in range(2): CONFIG['powervs-9-quota-slice']['sao04-powervs-9-quota-slice-{}'.format(i)] = 1 +for i in range(50): + CONFIG['aro-classic-test-msi-containers-int']['aro-classic-test-msi-containers-int-{}'.format(i)] = 1 + CONFIG['aro-classic-test-msi-containers-stg']['aro-classic-test-msi-containers-stg-{}'.format(i)] = 1 + CONFIG['aro-classic-test-msi-containers-prod']['aro-classic-test-msi-containers-prod-{}'.format(i)] = 1 + for i in range(300): CONFIG['aro-hcp-test-msi-containers-dev']['aro-hcp-test-msi-containers-dev-{}'.format(i)] = 1 for i in range(150):