From d7e15fce6e17f6a925333b92b201486a7952ef1f Mon Sep 17 00:00:00 2001 From: Mateus Oliveira Date: Wed, 14 Aug 2024 15:04:02 -0300 Subject: [PATCH] fix: OADP must-gather mirror job Signed-off-by: Mateus Oliveira --- .../oadp-operator/openshift-oadp-operator-master.yaml | 9 ++++++++- .../openshift-oadp-operator-master-postsubmits.yaml | 2 ++ .../openshift-oadp-operator-master-presubmits.yaml | 2 ++ .../image-mirroring/konveyor/mapping_konveyor_latest | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml index 15e288289dad..0bc80a0e81d1 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml @@ -7,9 +7,16 @@ images: - dockerfile_path: Dockerfile multi_arch: true to: oadp-operator +- context_dir: must-gather + dockerfile_path: Dockerfile + multi_arch: true + to: oadp-must-gather promotion: to: - - name: oadp-operator + - additional_images: + oadp-operator: oadp-operator + oadp-must-gather: oadp-must-gather + name: oadp-operator namespace: konveyor resources: '*': diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml index d98dbbb8e640..0b7ee47c7740 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml @@ -23,6 +23,8 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=oadp-must-gather + - --target=oadp-operator command: - ci-operator image: ci-operator:latest diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml index f1d53c65c289..53138b8479e5 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml @@ -867,6 +867,8 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=oadp-must-gather + - --target=oadp-operator command: - ci-operator image: ci-operator:latest diff --git a/core-services/image-mirroring/konveyor/mapping_konveyor_latest b/core-services/image-mirroring/konveyor/mapping_konveyor_latest index a09482f29dee..87ad5ae7dae4 100644 --- a/core-services/image-mirroring/konveyor/mapping_konveyor_latest +++ b/core-services/image-mirroring/konveyor/mapping_konveyor_latest @@ -32,3 +32,4 @@ registry.ci.openshift.org/konveyor/oadp-operator:oadp-operator quay.io/konveyor/ registry.ci.openshift.org/konveyor/oadp-operator:oadp-operator-1.0 quay.io/konveyor/oadp-operator:oadp-1.0-latest quay.io/konveyor/oadp-operator:oadp-1.0 registry.ci.openshift.org/konveyor/oadp-operator:oadp-operator-1.3 quay.io/konveyor/oadp-operator:oadp-1.3-latest quay.io/konveyor/oadp-operator:oadp-1.3 registry.ci.openshift.org/konveyor/oadp-operator:oadp-operator-1.4 quay.io/konveyor/oadp-operator:oadp-1.4-latest quay.io/konveyor/oadp-operator:oadp-1.4 +registry.ci.openshift.org/konveyor/oadp-operator:oadp-must-gather quay.io/konveyor/oadp-must-gather:latest