Skip to content

Promote oadp-operator bundle/index/e2e-test-binary images (oadp-dev, oadp-1.6) #83110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Aug 7, 2026
Merged

Promote oadp-operator bundle/index/e2e-test-binary images (oadp-dev, oadp-1.6) #83110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,22 @@ images:
- arm64
dockerfile_path: Dockerfile
to: oadp-operator-1.6
- dockerfile_path: build/ci-Dockerfile
to: test-oadp-operator
operator:
bundles:
- dockerfile_path: build/Dockerfile.bundle
Comment on lines +15 to +16

@coderabbitai coderabbitai Bot Aug 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail
rg -n -C 6 \
  'dockerfile_path: build/Dockerfile\.bundle|substitutions:|quay\.io/konveyor/oadp-operator:oadp-(1\.6|dev)|with: oadp-operator(-1\.6)?' \
  ci-operator/config/oadp-qe ci-operator/config/openshift/oadp-operator

Repository: openshift/release

Length of output: 31311

🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail

printf '%s\n' '--- target configurations ---'
cat -n ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml
cat -n ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml

printf '%s\n' '--- bundle Dockerfile and referenced pullspecs ---'
fd -i 'Dockerfile.bundle' .
bundle="$(fd -i 'Dockerfile.bundle' . | head -n 1)"
if [ -n "$bundle" ]; then
  cat -n "$bundle"
  rg -n 'quay\.io/konveyor|oadp-operator|velero-plugin|hypershift|kubevirt' "$bundle" || true
fi

printf '%s\n' '--- source and generated OADP configurations ---'
rg -l -n 'openshift-oadp-operator-oadp-(1\.6|dev)(\.yaml|__)' ci-operator/config/openshift/oadp-operator ci-operator/jobs/openshift/oadp-operator 2>/dev/null || true
rg -n -C 3 'dockerfile_path: build/Dockerfile\.bundle|substitutions:|pullspec: quay\.io/konveyor/oadp-operator:(oadp-1\.6|latest|oadp-dev)' ci-operator/config/openshift/oadp-operator

Repository: openshift/release

Length of output: 20169

🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail

printf '%s\n' '--- all development substitutions in this repository ---'
rg -n -C 2 \
  'oadp-operator:([^[:space:]]+)|with: oadp-operator' \
  ci-operator/config/openshift/oadp-operator ci-operator/config/oadp-qe/oadp-operator

printf '%s\n' '--- repository metadata and bundle Dockerfile candidates ---'
curl -fsSL https://api.github.com/repos/konveyor/oadp-operator \
  | jq -r '"default_branch=\(.default_branch)\nclone_url=\(.clone_url)"'
for ref in main master oadp-1.6; do
  url="https://raw.githubusercontent.com/konveyor/oadp-operator/${ref}/build/Dockerfile.bundle"
  printf '%s\n' "--- ${url} ---"
  if curl -fsSL "$url"; then
    printf '\n'
  else
    printf 'not found\n'
  fi
done

Repository: openshift/release

Length of output: 13588

🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail

for branch in oadp-dev oadp-1.6; do
  printf '%s\n' "--- bundle files on ${branch} ---"
  curl -fsSL "https://api.github.com/repos/openshift/oadp-operator/contents/bundle/manifests?ref=${branch}" \
    | jq -r '.[].name'

  printf '%s\n' "--- image references on ${branch} ---"
  files="$(
    curl -fsSL "https://api.github.com/repos/openshift/oadp-operator/contents/bundle/manifests?ref=${branch}" \
      | jq -r '.[].download_url'
  )"
  while IFS= read -r url; do
    [ -n "$url" ] || continue
    curl -fsSL "$url"
  done <<< "$files" | rg -n 'image:|quay\.io/konveyor/oadp-operator|oadp-operator:(latest|oadp-dev|oadp-1\.6)' || true
done

Repository: openshift/release

Length of output: 9145

Add operator.substitutions to both bundle configurations.

Map quay.io/konveyor/oadp-operator:oadp-1.6 to oadp-operator-1.6. Map quay.io/konveyor/oadp-operator:latest to oadp-operator; the development bundle uses :latest, not :oadp-dev.

📍 Affects 2 files
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml#L15-L16 (this comment)
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml#L15-L16
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml`
around lines 15 - 16, Add an operator.substitutions mapping to both bundle
configurations: in
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6.yaml:15-16,
map quay.io/konveyor/oadp-operator:oadp-1.6 to oadp-operator-1.6; in
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml:15-16,
map quay.io/konveyor/oadp-operator:latest to oadp-operator. Ensure the
development bundle uses the :latest substitution.

Source: MCP tools

promotion:
to:
- name: oadp-operator
- excluded_images:
- test-oadp-operator
name: oadp-operator
namespace: konveyor
- additional_images:
oadp-operator-e2e-tests: test-oadp-operator
oadp-operator-index: ci-index
namespace: konveyor
tag: oadp-1.6
resources:
'*':
limits:
Expand Down
14 changes: 13 additions & 1 deletion ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,22 @@ images:
- arm64
dockerfile_path: Dockerfile
to: oadp-operator
- dockerfile_path: build/ci-Dockerfile
to: test-oadp-operator
operator:
bundles:
- dockerfile_path: build/Dockerfile.bundle
promotion:
to:
- name: oadp-operator
- excluded_images:
- test-oadp-operator
name: oadp-operator
namespace: konveyor
- additional_images:
oadp-operator-e2e-tests: test-oadp-operator
oadp-operator-index: ci-index
namespace: konveyor
tag: oadp-dev
resources:
'*':
limits:
Expand Down
2 changes: 2 additions & 0 deletions ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,12 +1934,14 @@ periodics:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
extra_refs:
- base_ref: oadp-1.6
org: openshift
repo: oadp-operator
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down
4 changes: 4 additions & 0 deletions ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ postsubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
capability/arm64: arm64
ci-operator.openshift.io/is-promotion: "true"
Expand All @@ -24,6 +25,8 @@ postsubmits:
- --promote
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=ci-index
- --target=test-oadp-operator
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -71,6 +74,7 @@ postsubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
max_concurrency: 1
Expand Down
61 changes: 61 additions & 0 deletions ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2360,6 +2360,63 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )5.1-images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^oadp-1\.6$
- ^oadp-1\.6-
cluster: build01
context: ci/prow/ci-index
decorate: true
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-oadp-1.6-ci-index
rerun_command: /test ci-index
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=ci-index
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( | .* )ci-index,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand All @@ -2371,6 +2428,7 @@ presubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
capability/arm64: arm64
ci.openshift.io/generator: prowgen
Expand All @@ -2384,6 +2442,8 @@ presubmits:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=ci-index
- --target=test-oadp-operator
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -2428,6 +2488,7 @@ presubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down
2 changes: 2 additions & 0 deletions ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,12 +1283,14 @@ periodics:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
extra_refs:
- base_ref: oadp-dev
org: openshift
repo: oadp-operator
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down
4 changes: 4 additions & 0 deletions ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ postsubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
capability/arm64: arm64
ci-operator.openshift.io/is-promotion: "true"
Expand All @@ -24,6 +25,8 @@ postsubmits:
- --promote
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=ci-index
- --target=test-oadp-operator
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -71,6 +74,7 @@ postsubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
max_concurrency: 1
Expand Down
61 changes: 61 additions & 0 deletions ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,6 +1273,63 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )5.1-images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^oadp-dev$
- ^oadp-dev-
cluster: build05
context: ci/prow/ci-index
decorate: true
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-oadp-dev-ci-index
rerun_command: /test ci-index
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=ci-index
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( | .* )ci-index,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand All @@ -1284,6 +1341,7 @@ presubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
capability/arm64: arm64
ci.openshift.io/generator: prowgen
Expand All @@ -1297,6 +1355,8 @@ presubmits:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=ci-index
- --target=test-oadp-operator
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -1341,6 +1401,7 @@ presubmits:
decoration_config:
sparse_checkout_files:
- Dockerfile
- build/ci-Dockerfile
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down