Skip to content

USHIFT-7041: Switch CI Doctor jobs to the new directory structure#80264

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
ggiguash:ci-doctor-dir-restructure
Jun 10, 2026
Merged

USHIFT-7041: Switch CI Doctor jobs to the new directory structure#80264
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
ggiguash:ci-doctor-dir-restructure

Conversation

@ggiguash

@ggiguash ggiguash commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Blocked on openshift-eng/edge-tooling#181

Summary by CodeRabbit

This PR updates CI Doctor job configuration and scripts for the OpenShift Edge Tooling CI infrastructure to align with a new directory/naming structure.

Changes made:

  1. Configuration Template Updates (openshift-eng-edge-tooling-main.yaml):

    • Updated CI notification email/Slack report templates for MicroShift and LVMS CI Doctor workflows
    • Changed how report filenames are referenced in the templates (e.g., lvm-operator-ci-doctor-report.htmlreport-lvm-operator-ci-doctor.html and microshift-ci-doctor-report.htmlreport-microshift-ci-doctor.html)
    • Modified how report URLs and artifact links are constructed in the notifications
  2. LVMS CI Post-Commands Script: Updated the download_report() function to use the renamed artifact filename (report-lvm-operator-ci-doctor.html)

  3. MicroShift CI Post-Commands Script: Updated the download_report() function to use the renamed artifact filename (report-microshift-ci-doctor.html)

Status: This PR is currently blocked pending completion of openshift-eng/edge-tooling#181, indicating these are dependent changes in a larger CI restructuring effort.

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

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot

openshift-ci-robot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

@ggiguash: This pull request references USHIFT-7041 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 story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Blocked on openshift-eng/edge-tooling#181

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.

@openshift-ci openshift-ci Bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 9, 2026
@coderabbitai

coderabbitai Bot commented Jun 9, 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: fec6e520-bf41-4fb5-b442-6b40bdaf247a

📥 Commits

Reviewing files that changed from the base of the PR and between 5bb969c and abe05a9.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-periodics.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (3)
  • ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml
  • ci-operator/step-registry/openshift/edge-tooling/lvms-ci/post/openshift-edge-tooling-lvms-ci-post-commands.sh
  • ci-operator/step-registry/openshift/edge-tooling/microshift-ci/post/openshift-edge-tooling-microshift-ci-post-commands.sh

Walkthrough

Two CI workflows standardize report artifact filenames. MicroShift CI Doctor and LVMS CI Doctor each update their YAML report template definitions and shell script download functions to use new, consistent filename conventions, ensuring templates and generated artifacts align.

Changes

CI Report Filename Standardization

Layer / File(s) Summary
MicroShift CI Doctor report updates
ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml, ci-operator/step-registry/openshift/edge-tooling/microshift-ci/post/openshift-edge-tooling-microshift-ci-post-commands.sh
MicroShift CI Doctor workflow updates its report template header icon and URL construction to use report-microshift-ci-doctor.html, and the download script now fetches that same filename instead of microshift-ci-doctor-report.html.
LVMS CI Doctor report updates
ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml, ci-operator/step-registry/openshift/edge-tooling/lvms-ci/post/openshift-edge-tooling-lvms-ci-post-commands.sh
LVMS CI Doctor workflow converts its report template to variable-based URL construction for report-lvm-operator-ci-doctor.html, and the download script uses the same filename instead of lvm-operator-ci-doctor-report.html.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

  • openshift/release#80143: Refactors the same report_template logic in MicroShift CI Doctor configuration while adding a close-stale-bugs step.

Suggested labels

lgtm

Suggested reviewers

  • agullon
  • jerpeter1
  • eslutsky
🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately references USHIFT-7041 and describes the main change: switching CI Doctor jobs to a new directory structure, which aligns with the updates to CI notification templates and artifact filenames across the three modified files.
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 PR contains no Ginkgo test files or test title declarations. Changes are limited to CI config YAML and shell scripts for CI operators, which are outside the scope of this check.
Test Structure And Quality ✅ Passed PR contains only CI configuration YAML and shell scripts with no Ginkgo test code; custom check for Ginkgo test quality is not applicable.
Microshift Test Compatibility ✅ Passed This PR does not add any new Ginkgo e2e tests. It only modifies CI configuration and report artifact filenames in shell scripts, making this check not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. Changes are CI infrastructure only (YAML config and shell script updates for artifact filenames). SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI configuration and scripts only (report templates/filenames). No deployment manifests, operator code, or scheduling constraints present.
Ote Binary Stdout Contract ✅ Passed PR contains only YAML config and bash shell scripts for CI workflows; no Go code or OTE test binaries present, making the OTE Binary Stdout Contract check not applicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR does not add new Ginkgo e2e tests. Changes are limited to CI configuration files and shell scripts for report generation/downloading, not test code.
No-Weak-Crypto ✅ Passed PR contains only CI/CD configuration and shell script updates for report filenames and URLs; no cryptographic code or weak crypto usage detected.
Container-Privileges ✅ Passed PR modifies only CI/CD configuration and shell scripts; contains no Kubernetes/container manifests with privileged security specs.
No-Sensitive-Data-In-Logs ✅ Passed The PR changes only log generic status messages and construct URLs from public CI metadata (job names, build IDs, repo names). No passwords, tokens, API keys, or credentials are logged.

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

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@ggiguash: 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
periodic-ci-openshift-eng-edge-tooling-main-lvms-ci-doctor N/A periodic Ci-operator config changed
periodic-ci-openshift-eng-edge-tooling-main-microshift-ci-doctor N/A periodic Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

@ggiguash ggiguash marked this pull request as ready for review June 9, 2026 15:36
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 9, 2026
@ggiguash

ggiguash commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-eng-edge-tooling-main-lvms-ci-doctor periodic-ci-openshift-eng-edge-tooling-main-microshift-ci-doctor

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-ci openshift-ci Bot requested review from jogeo and pmtk June 9, 2026 15:38
@ggiguash

ggiguash commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@ggiguash: 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 Jun 9, 2026
@kasturinarra

Copy link
Copy Markdown
Contributor

/lgtm

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

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, kasturinarra

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

@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

@ggiguash: 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.

@openshift-merge-bot openshift-merge-bot Bot merged commit ceb540e into openshift:main Jun 10, 2026
20 checks passed
@ggiguash ggiguash deleted the ci-doctor-dir-restructure branch June 10, 2026 06:43
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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants