diff --git a/ci-operator/config/openshift/images/openshift-images-master.yaml b/ci-operator/config/openshift/images/openshift-images-master.yaml index bb0a65de1be49..1558229660e5f 100644 --- a/ci-operator/config/openshift/images/openshift-images-master.yaml +++ b/ci-operator/config/openshift/images/openshift-images-master.yaml @@ -55,6 +55,71 @@ tests: steps: cluster_profile: equinix-ocp-metal workflow: baremetalds-e2e-ovn-ipv6 +- as: tests-extension + run_if_changed: ^(tests-extension/) + steps: + test: + - as: sanity + commands: | + cd tests-extension + make verify + make build + make verify-metadata + from: src + resources: + requests: + cpu: 100m +- always_run: false + as: e2e-metal-ipi-tests-ext + optional: true + steps: + cluster_profile: equinix-ocp-metal + test: + - as: test + cli: latest + commands: | + cd tests-extension + make build + ./bin/ipfailover-tests-ext run-suite ipfailover/all --max-concurrency=1 + from: src + resources: + requests: + cpu: 100m + workflow: baremetalds-e2e-ovn-ipv4 +- always_run: false + as: e2e-openstack-ipi-tests-ext + optional: true + steps: + cluster_profile: openstack-vexxhost + test: + - as: test + cli: latest + commands: | + cd tests-extension + make build + ./bin/ipfailover-tests-ext run-suite ipfailover/all --max-concurrency=1 + from: src + resources: + requests: + cpu: 100m + workflow: openshift-e2e-openstack-ipi +- always_run: false + as: e2e-vsphere-ovn-tests-ext + optional: true + steps: + cluster_profile: vsphere-elastic + test: + - as: test + cli: latest + commands: | + cd tests-extension + make build + ./bin/ipfailover-tests-ext run-suite ipfailover/all --max-concurrency=1 + from: src + resources: + requests: + cpu: 100m + workflow: openshift-e2e-vsphere-ovn - as: verify-deps steps: env: diff --git a/ci-operator/jobs/openshift/images/openshift-images-master-presubmits.yaml b/ci-operator/jobs/openshift/images/openshift-images-master-presubmits.yaml index ff747ed134cab..c7718596b52d0 100644 --- a/ci-operator/jobs/openshift/images/openshift-images-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/images/openshift-images-master-presubmits.yaml @@ -259,6 +259,267 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/e2e-metal-ipi-tests-ext + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - base/Dockerfile.rhel + - base/Dockerfile.rhel9 + - ipfailover/keepalived/Dockerfile + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-images-master-e2e-metal-ipi-tests-ext + optional: true + rerun_command: /test e2e-metal-ipi-tests-ext + 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-metal-ipi-tests-ext + 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-metal-ipi-tests-ext,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/e2e-openstack-ipi-tests-ext + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - base/Dockerfile.rhel + - base/Dockerfile.rhel9 + - ipfailover/keepalived/Dockerfile + 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-images-master-e2e-openstack-ipi-tests-ext + optional: true + rerun_command: /test e2e-openstack-ipi-tests-ext + 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-openstack-ipi-tests-ext + 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-openstack-ipi-tests-ext,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: vsphere02 + context: ci/prow/e2e-vsphere-ovn-tests-ext + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - base/Dockerfile.rhel + - base/Dockerfile.rhel9 + - ipfailover/keepalived/Dockerfile + labels: + ci-operator.openshift.io/cloud: vsphere + ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-images-master-e2e-vsphere-ovn-tests-ext + optional: true + rerun_command: /test e2e-vsphere-ovn-tests-ext + 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-vsphere-ovn-tests-ext + 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-vsphere-ovn-tests-ext,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -466,6 +727,91 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-scos-images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build03 + context: ci/prow/tests-extension + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - base/Dockerfile.rhel + - base/Dockerfile.rhel9 + - ipfailover/keepalived/Dockerfile + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-images-master-tests-extension + rerun_command: /test tests-extension + run_if_changed: ^(tests-extension/) + 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=tests-extension + 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( | .* )tests-extension,?($|\s.*) - agent: kubernetes always_run: true branches: