Skip to content

AGENT-1577: Configure branch for appliance agent-preinstall-image-builder - #83022

Open
zaneb wants to merge 3 commits into
openshift:mainfrom
zaneb:agent-preinstall-image-builder
Open

AGENT-1577: Configure branch for appliance agent-preinstall-image-builder#83022
zaneb wants to merge 3 commits into
openshift:mainfrom
zaneb:agent-preinstall-image-builder

Conversation

@zaneb

@zaneb zaneb commented Aug 6, 2026

Copy link
Copy Markdown
Member

Configure the branch agent-preinstall-image-builder in the openshift/appliance repo to sustain builds of the original appliance concept.

Builds of the OVE installer ISO will continue on master, with release branches for each version of OCP. These will be promoted to a separate image name (agent-release-iso-builder) starting with the current master branch (5.0/4.23).

Summary by CodeRabbit

  • Adds CI build and test configuration for the agent-preinstall-image-builder branch in openshift/appliance.
  • Promotes OVE installer ISO builds as agent-release-iso-builder on master and release branches.
  • Updates appliance E2E workflows to use agent-release-iso-builder.
  • Excludes the intermediate ubi9-minimal-entitled image from promotion.
  • Adds branch-specific Tide queries and merge requirements for openshift/appliance.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 6, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@zaneb: This pull request references AGENT-1577 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Configure the branch agent-preinstall-image-builder in the openshift/appliance repo to sustain builds of the original appliance concept.

Builds of the OVE installer ISO will continue on master, with release branches for each version of OCP. These will be promoted to a separate image name (agent-release-iso-builder) starting with the current master branch (5.0/4.23).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 3a39ddf1-8982-40b4-9557-8e478d19e082

📥 Commits

Reviewing files that changed from the base of the PR and between add2700 and d5d1f23.

⛔ Files ignored due to path filters (4)
  • ci-operator/jobs/openshift/appliance/openshift-appliance-agent-preinstall-image-builder-periodics.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/appliance/openshift-appliance-agent-preinstall-image-builder-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/appliance/openshift-appliance-agent-preinstall-image-builder-presubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/appliance/openshift-appliance-master-periodics.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (8)
  • ci-operator/config/openshift/appliance/openshift-appliance-agent-preinstall-image-builder.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-master.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.21.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.22.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.23.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-5.0.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-5.1.yaml
  • core-services/prow/02_config/openshift/appliance/_prowconfig.yaml
🚧 Files skipped from review as they are similar to previous changes (8)
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.21.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.22.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-5.0.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.23.yaml
  • core-services/prow/02_config/openshift/appliance/_prowconfig.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-agent-preinstall-image-builder.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-5.1.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-master.yaml

Walkthrough

The changes add an appliance agent image-builder configuration, update release promotion targets and E2E image dependencies, and define branch-specific Tide queries for openshift/appliance.

Changes

Appliance CI and release configuration

Layer / File(s) Summary
Agent image-builder pipeline
ci-operator/config/openshift/appliance/openshift-appliance-agent-preinstall-image-builder.yaml
Adds image inputs, promotion, resource settings, lint and unit tests, daily publishing, IPv4 and dual-stack E2E workflows, and generated branch metadata.
Release promotion and E2E image wiring
ci-operator/config/openshift/appliance/openshift-appliance-master.yaml, ci-operator/config/openshift/appliance/openshift-appliance-release-4.*.yaml, ci-operator/config/openshift/appliance/openshift-appliance-release-5.*.yaml
Promotes agent-release-iso-builder, excludes ubi9-minimal-entitled, updates E2E image dependencies, and removes the obsolete master publish test.
Branch-specific Tide queries
core-services/prow/02_config/openshift/appliance/_prowconfig.yaml
Adds branch-specific Tide queries and label requirements. Removes the repository-specific squash merge setting.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

Suggested reviewers: danielerez, andfasano, gamli75

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: configuring the appliance agent-preinstall-image-builder branch and its CI support.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The commit changes only YAML CI configurations and generated jobs; it adds no Ginkgo declarations, and all CI test aliases are static descriptive identifiers.
Test Structure And Quality ✅ Passed The PR changes only 10 YAML CI/Prow files; added tests call make targets or referenced workflows, with no Ginkgo It blocks, assertions, resource setup, or Eventually/Consistently calls to review.
Microshift Test Compatibility ✅ Passed The pull request changes only CI and Prow YAML files; it adds no Ginkgo test implementation or It/Describe/Context/When declarations to assess for MicroShift compatibility.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The commit changes only CI and Prow YAML files; searches found no added Ginkgo It, Describe, Context, or When test definitions, so the SNO test check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Changed files are CI operator and Tide YAML only; searches found no workload kinds or topology-sensitive scheduling keys such as affinity, node selectors, tolerations, replicas, or PDBs.
Ote Binary Stdout Contract ✅ Passed The pull request changes only 12 YAML CI/PROW configuration files; it adds no OTE binary, suite setup, or process-level stdout code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The patch changes only YAML CI and Prow configuration files; it adds no Ginkgo test implementations or new It/Describe/Context/When blocks to assess.
No-Weak-Crypto ✅ Passed The changed CI YAML and generated Prow job files contain no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret-comparison logic.
Container-Privileges ✅ Passed Changed CI operator and generated Prow YAML contains no privileged:true, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or explicit root settings.
No-Sensitive-Data-In-Logs ✅ Passed Changed CI YAML adds no logging or output of secret values, credentials, PII, or customer data; secret paths are standard mounted references and tests run only lint/unit commands.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci
openshift-ci Bot requested review from andfasano and gamli75 August 6, 2026 10:14
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 6, 2026

@coderabbitai coderabbitai Bot left a comment

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.

Actionable comments posted: 2

🤖 Prompt for all review comments with 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.

Inline comments:
In
`@ci-operator/config/openshift/appliance/openshift-appliance-agent-preinstall-image-builder.yaml`:
- Around line 64-88: Update the E2E workflow definitions for
e2e-sno-dualstack-dhcp and e2e-sno-dualstack-dhcp-periodic to add
steps.dependencies.APPLIANCE_IMAGE, mapping it to the built appliance image used
by the release configurations. Keep the existing workflow and scheduling
settings unchanged, and apply the dependency consistently to both dual-stack
tests.

In `@core-services/prow/02_config/openshift/appliance/_prowconfig.yaml`:
- Around line 20-56: Add Tide coverage for release-4.23, release-5.0, and
release-5.1 in the appliance configuration by adding them to the applicable
includedBranches list or defining separate queries if their label policies
differ. Preserve the existing labels, missingLabels, and repository targeting
for branches sharing the current policy.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: add32dc2-2333-455e-a786-0bec6724acba

📥 Commits

Reviewing files that changed from the base of the PR and between b8ce723 and 32b6101.

⛔ Files ignored due to path filters (4)
  • ci-operator/jobs/openshift/appliance/openshift-appliance-agent-preinstall-image-builder-periodics.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/appliance/openshift-appliance-agent-preinstall-image-builder-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/appliance/openshift-appliance-agent-preinstall-image-builder-presubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/appliance/openshift-appliance-master-periodics.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (8)
  • ci-operator/config/openshift/appliance/openshift-appliance-agent-preinstall-image-builder.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-master.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.21.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.22.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-4.23.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-5.0.yaml
  • ci-operator/config/openshift/appliance/openshift-appliance-release-5.1.yaml
  • core-services/prow/02_config/openshift/appliance/_prowconfig.yaml

Comment thread core-services/prow/02_config/openshift/appliance/_prowconfig.yaml
@zaneb
zaneb force-pushed the agent-preinstall-image-builder branch from 32b6101 to 1c866db Compare August 6, 2026 10:36
@coderabbitai

coderabbitai Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@zaneb

zaneb commented Aug 6, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse
/cc @danielerez

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@zaneb: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci
openshift-ci Bot requested a review from danielerez August 6, 2026 10:52
@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@zaneb: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/periodic-ci-openshift-appliance-agent-preinstall-image-builder-publish 1c866db link unknown /pj-rehearse periodic-ci-openshift-appliance-agent-preinstall-image-builder-publish

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@zaneb

zaneb commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

I'm not sure why periodic-ci-openshift-appliance-agent-preinstall-image-builder-publish failed to build ubi9-minimal-entitled when e.g. periodic-ci-openshift-appliance-agent-preinstall-image-builder-e2e-sno-dualstack-dhcp-periodic succeeded, but I don't think it's due to a problem with the config, which was moved directly from master.
/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@zaneb: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 7, 2026
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 9, 2026
zaneb added 3 commits August 11, 2026 17:53
The original agent-preinstall-image-builder built from the appliance
repo was branchless, but the OVE installer ISO base images are built
from the various release branches for each OpenShift version. Therefore
we need the same branch configuration for backports as other OCP repos.
This is an intermediate image, and should not be promoted.
…lder

Configure the branch agent-preinstall-image-builder in the
openshift/appliance repo to sustain builds of the original appliance
concept.

Builds of the OVE installer ISO will continue on master, with
release branches for each version of OCP. These will be promoted to a
separate image name (agent-release-iso-builder) starting with the
current master branch (5.0/4.23).
@zaneb
zaneb force-pushed the agent-preinstall-image-builder branch from 1c866db to d5d1f23 Compare August 11, 2026 06:04
@coderabbitai

coderabbitai Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 11, 2026
@openshift-merge-bot openshift-merge-bot Bot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 11, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@zaneb: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-appliance-agent-preinstall-image-builder-e2e-compact-ipv4-static openshift/appliance presubmit Presubmit changed
pull-ci-openshift-appliance-agent-preinstall-image-builder-e2e-sno-dualstack-dhcp openshift/appliance presubmit Presubmit changed
pull-ci-openshift-appliance-agent-preinstall-image-builder-images openshift/appliance presubmit Presubmit changed
pull-ci-openshift-appliance-agent-preinstall-image-builder-lint openshift/appliance presubmit Presubmit changed
pull-ci-openshift-appliance-agent-preinstall-image-builder-unit-test openshift/appliance presubmit Presubmit changed
pull-ci-openshift-appliance-release-4.21-e2e-agent-compact-ipv4-iso-no-registry openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-4.21-e2e-compact-ipv4-static openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-4.21-e2e-sno-dualstack-dhcp openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-4.21-images openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-4.21-lint openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-4.21-unit-test openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.0-e2e-agent-compact-ipv4-iso-no-registry openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.0-e2e-compact-ipv4-static openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.0-e2e-sno-dualstack-dhcp openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.0-images openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.0-lint openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.0-unit-test openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.1-e2e-agent-compact-ipv4-iso-no-registry openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.1-e2e-compact-ipv4-static openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.1-e2e-sno-dualstack-dhcp openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.1-images openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.1-lint openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-release-5.1-unit-test openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-master-e2e-agent-compact-ipv4-iso-no-registry openshift/appliance presubmit Ci-operator config changed
pull-ci-openshift-appliance-master-e2e-compact-ipv4-static openshift/appliance presubmit Ci-operator config changed

A total of 48 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@@ -1,9 +1,64 @@
tide:
merge_method:

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.

Was this intentional? Do we want to change the merge strategy?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Speaking only for myself, I do because squash merges are terrible 🙂

@danielerez

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 16, 2026
@openshift-ci

openshift-ci Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2026
@openshift-ci

openshift-ci Bot commented Aug 16, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielerez, zaneb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants