From 31eaa39a43f9f558171c640118446f97a029b09f Mon Sep 17 00:00:00 2001 From: Nicholas Yancey Date: Fri, 26 Jun 2026 13:00:40 -0400 Subject: [PATCH] Added Prow CI oadp-1.4 --- .../oadp-cli/migtools-oadp-cli-oadp-1.4.yaml | 26 ++++++++ ...igtools-oadp-cli-oadp-1.4-postsubmits.yaml | 64 +++++++++++++++++++ ...migtools-oadp-cli-oadp-1.4-presubmits.yaml | 59 +++++++++++++++++ .../konveyor/mapping_konveyor_latest | 1 + .../migtools/oadp-cli/_prowconfig.yaml | 1 + 5 files changed, 151 insertions(+) create mode 100644 ci-operator/config/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4.yaml create mode 100644 ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-postsubmits.yaml create mode 100644 ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-presubmits.yaml diff --git a/ci-operator/config/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4.yaml b/ci-operator/config/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4.yaml new file mode 100644 index 0000000000000..2d07acd15974e --- /dev/null +++ b/ci-operator/config/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4.yaml @@ -0,0 +1,26 @@ +build_root: + image_stream_tag: + name: builder + namespace: konveyor + tag: ubi9-v1.25 +images: + items: + - additional_architectures: + - arm64 + dockerfile_path: Containerfile.download + to: oadp-cli-oadp-1.4 +promotion: + to: + - name: oadp-cli + namespace: konveyor +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: oadp-1.4 + org: migtools + repo: oadp-cli diff --git a/ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-postsubmits.yaml new file mode 100644 index 0000000000000..063a3fecc0ff8 --- /dev/null +++ b/ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-postsubmits.yaml @@ -0,0 +1,64 @@ +postsubmits: + migtools/oadp-cli: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.4$ + cluster: build11 + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile.download + labels: + capability/arm64: arm64 + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-migtools-oadp-cli-oadp-1.4-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - 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/push-secret + name: push-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-presubmits.yaml b/ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-presubmits.yaml new file mode 100644 index 0000000000000..807cad28c7f25 --- /dev/null +++ b/ci-operator/jobs/migtools/oadp-cli/migtools-oadp-cli-oadp-1.4-presubmits.yaml @@ -0,0 +1,59 @@ +presubmits: + migtools/oadp-cli: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.4$ + - ^oadp-1\.4- + cluster: build10 + context: ci/prow/images + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile.download + labels: + capability/arm64: arm64 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-migtools-oadp-cli-oadp-1.4-images + rerun_command: /test images + 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 + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - 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: 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( | .* )images,?($|\s.*) diff --git a/core-services/image-mirroring/konveyor/mapping_konveyor_latest b/core-services/image-mirroring/konveyor/mapping_konveyor_latest index a6d2a45678721..a6ebeeae50227 100644 --- a/core-services/image-mirroring/konveyor/mapping_konveyor_latest +++ b/core-services/image-mirroring/konveyor/mapping_konveyor_latest @@ -46,6 +46,7 @@ quay.io/openshift/ci:konveyor_oadp-non-admin_oadp-non-admin-oadp-1.4 quay.io/kon quay.io/openshift/ci:konveyor_oadp-non-admin_oadp-non-admin-oadp-1.6 quay.io/konveyor/oadp-non-admin:oadp-1.6-latest quay.io/konveyor/oadp-non-admin:oadp-1.6 quay.io/openshift/ci:konveyor_oadp-cli_oadp-cli quay.io/konveyor/oadp-cli-binaries:latest +quay.io/openshift/ci:konveyor_oadp-cli_oadp-cli-oadp-1.4 quay.io/konveyor/oadp-cli-binaries:oadp-1.4-latest quay.io/konveyor/oadp-cli-binaries:oadp-1.4 quay.io/openshift/ci:konveyor_oadp-cli_oadp-cli-oadp-1.6 quay.io/konveyor/oadp-cli-binaries:oadp-1.6-latest quay.io/konveyor/oadp-cli-binaries:oadp-1.6 quay.io/openshift/ci:konveyor_oadp-cli_oadp-cli-oadp-1.5 quay.io/konveyor/oadp-cli-binaries:oadp-1.5-latest quay.io/konveyor/oadp-cli-binaries:oadp-1.5 diff --git a/core-services/prow/02_config/migtools/oadp-cli/_prowconfig.yaml b/core-services/prow/02_config/migtools/oadp-cli/_prowconfig.yaml index d0076f1826229..3f042eae23abc 100644 --- a/core-services/prow/02_config/migtools/oadp-cli/_prowconfig.yaml +++ b/core-services/prow/02_config/migtools/oadp-cli/_prowconfig.yaml @@ -16,6 +16,7 @@ branch-protection: tide: queries: - includedBranches: + - oadp-1.4 - oadp-1.5 - oadp-1.6 - oadp-dev