From 28246229a510f4b9f2c0a513a5e60d0cc9bb39eb Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Tue, 17 Mar 2026 11:55:05 -0400 Subject: [PATCH] Add Azure custom resource group test for MAO We have a bug where installing to a custom Azure resource group will result in a failure when provisioning a machine using a minimal spec. https://redhat.atlassian.net/browse/OCPBUGS-78424 This adds a job to test this specific flow. --- .../openshift-machine-api-operator-main.yaml | 15 ++++ ...ift-machine-api-operator-release-4.17.yaml | 15 ++++ ...ift-machine-api-operator-release-4.18.yaml | 15 ++++ ...ift-machine-api-operator-release-4.19.yaml | 15 ++++ ...ift-machine-api-operator-release-4.20.yaml | 15 ++++ ...ift-machine-api-operator-release-4.21.yaml | 15 ++++ ...ift-machine-api-operator-release-4.22.yaml | 15 ++++ ...ift-machine-api-operator-release-4.23.yaml | 15 ++++ ...hift-machine-api-operator-release-5.0.yaml | 15 ++++ ...-machine-api-operator-main-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.17-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.18-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.19-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.20-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.21-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.22-presubmits.yaml | 81 +++++++++++++++++++ ...-api-operator-release-4.23-presubmits.yaml | 81 +++++++++++++++++++ ...e-api-operator-release-5.0-presubmits.yaml | 81 +++++++++++++++++++ 18 files changed, 864 insertions(+) diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml index aab15992fd349..655b97a54c2ae 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-main.yaml @@ -123,6 +123,21 @@ tests: cpu: 100m timeout: 3h0m0s workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17.yaml index 713bf70fa7616..065ee88f8b79a 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17.yaml @@ -92,6 +92,21 @@ tests: requests: cpu: 100m workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml index faee8e672f9f7..08e393e01e99f 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18.yaml @@ -100,6 +100,21 @@ tests: requests: cpu: 100m workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml index fb167678042ff..bd9a5220ab2bb 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19.yaml @@ -100,6 +100,21 @@ tests: requests: cpu: 100m workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml index 2162772589c43..b660ef5d349cf 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20.yaml @@ -120,6 +120,21 @@ tests: requests: cpu: 100m workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml index 3d49fe5a65bcf..a4a553a28e52d 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21.yaml @@ -123,6 +123,21 @@ tests: cpu: 100m timeout: 3h0m0s workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22.yaml index fbae70cee5934..0c7b08b2dfb4c 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22.yaml @@ -124,6 +124,21 @@ tests: cpu: 100m timeout: 3h0m0s workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23.yaml index 62eef350f2e13..4479b68c8a6f5 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23.yaml @@ -123,6 +123,21 @@ tests: cpu: 100m timeout: 3h0m0s workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0.yaml index f7e12d413ee87..6f5e6b0214321 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0.yaml @@ -123,6 +123,21 @@ tests: cpu: 100m timeout: 3h0m0s workflow: ipi-azure +- always_run: false + as: e2e-azure-resourcegroup + optional: true + steps: + cluster_profile: openshift-org-azure + test: + - as: test + cli: latest + commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e + from: stable:cluster-api-actuator-pkg + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: openshift-e2e-azure-resourcegroup - always_run: false as: e2e-azure-manual-oidc optional: true diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml index fe79f3e629b24..acc93c9356760 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-main-presubmits.yaml @@ -648,6 +648,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build11 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-main-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17-presubmits.yaml index 90b6777c1e1aa..aefa896a1305b 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.17-presubmits.yaml @@ -486,6 +486,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.17$ + - ^release-4\.17- + cluster: build08 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.17-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18-presubmits.yaml index 12bf3a9a85dbd..d085aecffb78a 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.18-presubmits.yaml @@ -486,6 +486,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.18$ + - ^release-4\.18- + cluster: build11 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.18-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19-presubmits.yaml index 0d09a2261a7b6..3d987fe58ae41 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.19-presubmits.yaml @@ -486,6 +486,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.19$ + - ^release-4\.19- + cluster: build01 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.19-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20-presubmits.yaml index 9896a8228b733..a1b93943cb910 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.20-presubmits.yaml @@ -567,6 +567,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.20$ + - ^release-4\.20- + cluster: build11 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.20-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21-presubmits.yaml index db5bd547b2abf..f00f81ffaa986 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.21-presubmits.yaml @@ -648,6 +648,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build08 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.21-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22-presubmits.yaml index b028bca31e4b1..984acdea9471d 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.22-presubmits.yaml @@ -648,6 +648,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build08 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.22-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23-presubmits.yaml index 09de555bfd2a4..5e56c0f56dd29 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.23-presubmits.yaml @@ -648,6 +648,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.23$ + - ^release-4\.23- + cluster: build11 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-4.23-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0-presubmits.yaml index f0af10e59d451..6ad48a29642df 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-5.0-presubmits.yaml @@ -648,6 +648,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-5\.0$ + - ^release-5\.0- + cluster: build01 + context: ci/prow/e2e-azure-resourcegroup + decorate: true + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-machine-api-operator-release-5.0-e2e-azure-resourcegroup + optional: true + rerun_command: /test e2e-azure-resourcegroup + 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-azure-resourcegroup + 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-azure-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: