From c8fd2e924f136a1c0bbe3c6efd644111e211c365 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 18 Dec 2024 20:48:27 -0500 Subject: [PATCH] wip --- .../openshift/os/openshift-os-master.yaml | 2 - .../os/openshift-os-master-presubmits.yaml | 75 +++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index f4cd1ba2e3e35..ea75656685f8e 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -31,7 +31,6 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" - # dockerfile_path: Containerfile dockerfile_literal: | FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos ARG OPENSHIFT_CI=0 @@ -50,7 +49,6 @@ promotion: to: - excluded_images: - build-image - # we don't promote for now, but we do test with it - rhel-coreos name: "4.19" namespace: ocp diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml index 842e61c00b666..209eb67e91422 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml @@ -1,5 +1,80 @@ presubmits: openshift/os: + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build10 + context: ci/prow/e2e-aws-ovn + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-master-e2e-aws-ovn + rerun_command: /test e2e-aws-ovn + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + 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-aws-ovn + 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: /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-aws-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: