diff --git a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml index d29b33b20cfa5..a75bf509bcd51 100644 --- a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml +++ b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml @@ -23,6 +23,11 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: agent-installer-utils +- dockerfile_literal: | + FROM src + RUN dnf install -y skopeo sudo podman && dnf clean all + from: src + to: ove-base-src promotion: to: - name: "4.19" @@ -104,6 +109,26 @@ tests: container: from: src skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$) +- as: e2e-agent-ove + skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$) + steps: + test: + - as: iso-builder + commands: | + export PULL_SECRET_FILE=/var/secrets/registry-pull-secret/.dockerconfigjson + cd tools/iso_builder + ./hack/build-ove-image.sh --release-image-url $RELEASE_IMAGE_LATEST --pull-secret-file $PULL_SECRET_FILE --arch x86_64 + credentials: + - mount_path: /var/secrets/registry-pull-secret + name: registry-pull-credentials + namespace: test-credentials + dependencies: + - env: RELEASE_IMAGE_LATEST + name: release:latest + from: ove-base-src + resources: + requests: + cpu: 100m zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-presubmits.yaml b/ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-presubmits.yaml index d1b7ccc177d0a..dcc6c24fe3db6 100644 --- a/ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/agent-installer-utils/openshift-agent-installer-utils-main-presubmits.yaml @@ -229,6 +229,67 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-agent-ha-dualstack,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build05 + context: ci/prow/e2e-agent-ove + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-agent-installer-utils-main-e2e-agent-ove + rerun_command: /test e2e-agent-ove + skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$) + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-agent-ove + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - 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: 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-agent-ove,?($|\s.*) - agent: kubernetes always_run: false branches: