From 74e77b2047a5044b125392f79466d591d41ed625 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 10 Oct 2024 16:21:41 -0400 Subject: [PATCH] Add an optional OpenStack job to cluster-ingress-operator (#57477) We didn't have a job and we want to be able to run one to test our PRs. --- ...shift-cluster-ingress-operator-master.yaml | 18 +++++ ...cluster-ingress-operator-release-4.18.yaml | 18 +++++ ...cluster-ingress-operator-release-4.19.yaml | 18 +++++ ...er-ingress-operator-master-presubmits.yaml | 79 +++++++++++++++++++ ...ress-operator-release-4.18-presubmits.yaml | 79 +++++++++++++++++++ ...ress-operator-release-4.19-presubmits.yaml | 79 +++++++++++++++++++ 6 files changed, 291 insertions(+) diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml index 032a696f1576..ceef4ad7e827 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml @@ -165,6 +165,24 @@ tests: requests: cpu: 100m workflow: ipi-aws +- always_run: false + as: e2e-openstack-operator + optional: true + steps: + cluster_profile: openstack-vexxhost + env: + BASE_DOMAIN: shiftstack.devcluster.openshift.com + CONFIG_TYPE: minimal + NETWORK_TYPE: OVNKubernetes + test: + - as: test + cli: latest + commands: make test-e2e + from: src + resources: + requests: + cpu: 100m + workflow: openshift-e2e-openstack-ipi zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18.yaml index 0c75db152cf7..581593f534da 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18.yaml @@ -166,6 +166,24 @@ tests: requests: cpu: 100m workflow: ipi-aws +- always_run: false + as: e2e-openstack-operator + optional: true + steps: + cluster_profile: openstack-vexxhost + env: + BASE_DOMAIN: shiftstack.devcluster.openshift.com + CONFIG_TYPE: minimal + NETWORK_TYPE: OVNKubernetes + test: + - as: test + cli: latest + commands: make test-e2e + from: src + resources: + requests: + cpu: 100m + workflow: openshift-e2e-openstack-ipi zz_generated_metadata: branch: release-4.18 org: openshift diff --git a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19.yaml index e053cde17f9a..cc854db988f4 100644 --- a/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19.yaml @@ -165,6 +165,24 @@ tests: requests: cpu: 100m workflow: ipi-aws +- always_run: false + as: e2e-openstack-operator + optional: true + steps: + cluster_profile: openstack-vexxhost + env: + BASE_DOMAIN: shiftstack.devcluster.openshift.com + CONFIG_TYPE: minimal + NETWORK_TYPE: OVNKubernetes + test: + - as: test + cli: latest + commands: make test-e2e + from: src + resources: + requests: + cpu: 100m + workflow: openshift-e2e-openstack-ipi zz_generated_metadata: branch: release-4.19 org: openshift diff --git a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master-presubmits.yaml index d06f31b57c94..783baa66a999 100644 --- a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master-presubmits.yaml @@ -1107,6 +1107,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-openstack-operator + decorate: true + labels: + ci-operator.openshift.io/cloud: openstack-vexxhost + ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-ingress-operator-master-e2e-openstack-operator + optional: true + rerun_command: /test e2e-openstack-operator + 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 + - --secret-dir=/usr/local/e2e-openstack-operator-cluster-profile + - --target=e2e-openstack-operator + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-openstack-operator-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-openstack-vexxhost + - 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-openstack-operator,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18-presubmits.yaml index 32d52cd5ca36..17c0e2986029 100644 --- a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.18-presubmits.yaml @@ -1107,6 +1107,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.18$ + - ^release-4\.18- + cluster: build09 + context: ci/prow/e2e-openstack-operator + decorate: true + labels: + ci-operator.openshift.io/cloud: openstack-vexxhost + ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-ingress-operator-release-4.18-e2e-openstack-operator + optional: true + rerun_command: /test e2e-openstack-operator + 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 + - --secret-dir=/usr/local/e2e-openstack-operator-cluster-profile + - --target=e2e-openstack-operator + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-openstack-operator-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-openstack-vexxhost + - 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-openstack-operator,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19-presubmits.yaml index d39e48784252..dce0bab33465 100644 --- a/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-release-4.19-presubmits.yaml @@ -1107,6 +1107,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.19$ + - ^release-4\.19- + cluster: build09 + context: ci/prow/e2e-openstack-operator + decorate: true + labels: + ci-operator.openshift.io/cloud: openstack-vexxhost + ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-ingress-operator-release-4.19-e2e-openstack-operator + optional: true + rerun_command: /test e2e-openstack-operator + 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 + - --secret-dir=/usr/local/e2e-openstack-operator-cluster-profile + - --target=e2e-openstack-operator + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-openstack-operator-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-openstack-vexxhost + - 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-openstack-operator,?($|\s.*) - agent: kubernetes always_run: true branches: