Skip to content

NO-JIRA: upkeep: streamline build images and promotion#79058

Open
eggfoobar wants to merge 2 commits intoopenshift:mainfrom
eggfoobar:upkeep-streamline-edge-tooling-images
Open

NO-JIRA: upkeep: streamline build images and promotion#79058
eggfoobar wants to merge 2 commits intoopenshift:mainfrom
eggfoobar:upkeep-streamline-edge-tooling-images

Conversation

@eggfoobar
Copy link
Copy Markdown
Contributor

@eggfoobar eggfoobar commented May 8, 2026

updated to build from repo container files
updated to promote the tooling to be used by other periodics
added linter image instead of test build image

Summary

Updates CI configuration for the openshift-eng/edge-tooling repository to build and promote reusable tooling images from Containerfiles, simplify tests to run inside those images, and remove in-script prerequisite installation in the microshift-ci doctor step so the execution image must provide required tooling.

What changed (practical impact)

  • ci-operator now builds tooling images from Containerfile paths in the repo instead of embedding Dockerfile literals:
    • markdownlint-cli2 from images/Containerfile.markdownlint
    • edge-tooling-ai-helpers from images/Containerfile.ci
  • Image promotion updated to publish tooling into the ci namespace:
    • edge-tooling-ai-helpers and markdownlint-cli2 are promoted to ci:latest so other periodics can consume them
  • Tests/jobs simplified to rely on built images:
    • markdownlint job now runs in the markdownlint-cli2 image (container.from: markdownlint-cli2, clone: true) and invokes make lint-markdown directly
    • shellcheck job runs from the shellcheck base image with clone: true
    • removed prior inline test_binary_build_commands and previous shell-return/artefact-copying logic from the markdownlint test
  • microshift-ci doctor step script no longer installs prerequisites:
    • the script no longer performs in-script installation of gcloud/Python/other helpers and assumes the execution image contains required tools (install_prerequisites was removed)
    • it continues to load secrets, generate GitHub installation tokens, configure Claude (including optional JIRA MCP), run the doctor analysis with timeout and turn limits, attempt automatic restart of failed rebase PR tests, and copy/archive reports and Claude session logs into artifacts

Files/areas affected

  • ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml — switch to dockerfile_path build entries, promotion to ci namespace for tooling images, base images entries for claude-ai-helpers and shellcheck, and simplified test container/commands.
  • ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh — removed internal prerequisite installation; retained secrets handling, Claude/JIRA configuration, analysis run, automatic restart logic, and artifact/session archival.

These changes centralize Containerfile maintenance, make tooling images reusable across CI jobs, and reduce runtime setup by depending on more fully provisioned execution images.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 8, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@eggfoobar: This pull request explicitly references no jira issue.

Details

In response to this:

updated to build from repo container files
updated to promote the tooling to be used by other periodics
added linter image instead of test build image

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
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 8, 2026

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

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: 95095bb2-cbf3-4ddb-9885-4a43703e0395

📥 Commits

Reviewing files that changed from the base of the PR and between c18f660 and 1d97188.

⛔ Files ignored due to path filters (2)
  • ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
  • ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
💤 Files with no reviewable changes (1)
  • ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml

Walkthrough

Replaces inline Dockerfile literals with Dockerfile path references for two CI images, expands image promotion to include those images, simplifies markdownlint test job to use the new image, and removes the install_prerequisites() function and its call from the microshift CI doctor script.

Changes

Container build and test wiring

Layer / File(s) Summary
Data Shape / Image definitions
ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
Replaces inline dockerfile_literal image builds with dockerfile_path for markdownlint-cli2 (images/Containerfile.markdownlint) and edge-tooling-ai-helpers (images/Containerfile.ci).
Build Inputs / Wiring
ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
Wires edge-tooling-ai-helpers to consume gh-token via build inputs mapping.
Promotion
ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
Expands promotion.to.additional_images to include edge-tooling-ai-helpers, gh-token, and markdownlint-cli2 (previously only gh-token).
Tests / Job config
ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
tests.markdownlint now uses container.from: markdownlint-cli2, sets container.clone: true, and commands: make lint-markdown; removes previous shell block and test_binary_build_commands. tests.shellcheck.container now sets clone: true.

Microshift CI doctor script cleanup

Layer / File(s) Summary
Script flow / Shell
ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
Removes the install_prerequisites() function (gcloud and Python deps install) and its invocation; script now assumes required tooling is present in the environment/container.
Remaining behavior
ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
Secrets loading, Claude configuration, doctor analysis execution, and restart-of-failed-rebase-PR-tests logic are unchanged.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main changes: refactoring build image definitions to use dockerfile paths and updating image promotion configuration.
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 No Ginkgo test files present. PR only modifies CI config YAML and shell script. Check not applicable.
Test Structure And Quality ✅ Passed Custom check for Ginkgo test code quality is not applicable. PR modifies only CI/OpenShift YAML config and shell scripts, not test code.
Microshift Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR. Changes are limited to CI configuration YAML and bash shell scripts. Custom check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Check is not applicable. PR modifies CI configuration YAML and shell scripts only—no Ginkgo e2e tests are added or modified.
Topology-Aware Scheduling Compatibility ✅ Passed This PR modifies only CI configuration and build scripts. No deployment manifests, operator code, or controllers are added or modified. The check does not apply to CI infrastructure files.
Ote Binary Stdout Contract ✅ Passed PR modifies only CI/CD configuration files and shell scripts, no Go code or OTE test binaries. OTE stdout contract check is not applicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The custom check applies only to new Ginkgo e2e tests. This PR modifies CI/CD configuration (YAML) and infrastructure scripts (shell), not test code. No Ginkgo test patterns found.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2026
@openshift-ci openshift-ci Bot requested review from ggiguash and kasturinarra May 8, 2026 18:11
@eggfoobar
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 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-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml`:
- Around line 17-30: The CI config references three missing Containerfiles
(dockerfile_path: images/Containerfile.tooling,
images/Containerfile.markdownlint, images/Containerfile.ci) which will break
ci-operator; fix it by either adding the missing Containerfile files into an
images/ directory at those exact paths or updating the dockerfile_path values to
point to the correct existing Containerfile locations, and ensure any related
inputs/targets (to: gh-token, to: markdownlint-cli2, to: edge-tooling-ai-helpers
and the inputs.gh-token paths) are consistent with the new locations so the
builds can find the Dockerfiles.
🪄 Autofix (Beta)

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: a67db28f-2e6e-4721-a1b5-010e22e9effc

📥 Commits

Reviewing files that changed from the base of the PR and between 7fa7420 and f06ff71.

⛔ Files ignored due to path filters (2)
  • ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-postsubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
  • ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-ref.yaml

@eggfoobar
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

updated to build from repo container files
updated to promote the tooling to be used by other periodics
added linter image instead of test build image

Signed-off-by: ehila <ehila@redhat.com>
@eggfoobar eggfoobar force-pushed the upkeep-streamline-edge-tooling-images branch from f06ff71 to 53cb8cc Compare May 9, 2026 06:24
@eggfoobar
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@eggfoobar
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar

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

@eggfoobar eggfoobar force-pushed the upkeep-streamline-edge-tooling-images branch from 36e44ab to c18f660 Compare May 9, 2026 21:10
@eggfoobar
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

Signed-off-by: ehila <ehila@redhat.com>
@eggfoobar eggfoobar force-pushed the upkeep-streamline-edge-tooling-images branch from c18f660 to 1d97188 Compare May 9, 2026 21:38
@eggfoobar
Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@eggfoobar: 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-eng-edge-tooling-main-images openshift-eng/edge-tooling presubmit Presubmit changed
pull-ci-openshift-eng-edge-tooling-main-markdownlint openshift-eng/edge-tooling presubmit Ci-operator config changed
pull-ci-openshift-eng-edge-tooling-main-shellcheck openshift-eng/edge-tooling presubmit Ci-operator config changed
periodic-ci-openshift-eng-edge-tooling-main-ocp-ci-monitor N/A periodic Ci-operator config changed
periodic-ci-openshift-eng-edge-tooling-main-pr-notifier N/A periodic Ci-operator config changed
periodic-ci-openshift-eng-edge-tooling-main-microshift-ci-doctor N/A periodic Ci-operator config changed
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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 9, 2026

@eggfoobar: all tests passed!

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.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants