Skip to content

TRT-2689: Add verify-apm to the verify target#31379

Open
smg247 wants to merge 6 commits into
openshift:mainfrom
smg247:add-verify-apm-to-verify
Open

TRT-2689: Add verify-apm to the verify target#31379
smg247 wants to merge 6 commits into
openshift:mainfrom
smg247:add-verify-apm-to-verify

Conversation

@smg247

@smg247 smg247 commented Jul 10, 2026

Copy link
Copy Markdown
Member

Ensures that apm generation stays up-to-date

Summary by CodeRabbit

  • Chores
    • Updated the standard verification command to also validate generated APM documentation files, ensuring the workflow fails if regeneration is required.
    • Improved APM tooling behavior in automated runs by applying CI-specific caching settings for more consistent execution.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@openshift-ci-robot

openshift-ci-robot commented Jul 10, 2026

Copy link
Copy Markdown

@smg247: This pull request references TRT-2689 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:

Ensures that apm generation stays up-to-date

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 10, 2026
@openshift-ci openshift-ci Bot requested review from p0lyn0mial and sjenning July 10, 2026 14:21
@coderabbitai

coderabbitai Bot commented Jul 10, 2026

Copy link
Copy Markdown

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: 572be93c-21c1-420e-8dd2-ca011bb4c8ef

📥 Commits

Reviewing files that changed from the base of the PR and between fa6d1b2 and eaf6c07.

📒 Files selected for processing (1)
  • Makefile
🚧 Files skipped from review as they are similar to previous changes (1)
  • Makefile

Walkthrough

make verify now runs both origin and APM checks. The APM target conditionally sets uv cache and tool directories in CI for installation and compilation.

Changes

Makefile workflow updates

Layer / File(s) Summary
Verification target dependencies
Makefile
The verify target now depends on verify-origin and verify-apm, and is declared phony.
APM uvx environment configuration
Makefile
The APM target prefixes both uvx commands with CI-specific UV_CACHE_DIR and UV_TOOL_DIR settings.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Suggested reviewers: sjenning, p0lyn0mial

🚥 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 is concise and accurately highlights the main change: adding verify-apm to the verify target.
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 Only Makefile changed; no Ginkgo test titles were added or modified.
Test Structure And Quality ✅ Passed PR only changes Makefile targets; no Ginkgo tests or cluster-interaction test code were touched, so the check is not applicable.
Microshift Test Compatibility ✅ Passed Only Makefile changed; no new or modified Ginkgo e2e tests were added, so MicroShift compatibility is not implicated.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only Makefile changed; no new Ginkgo tests or SNO-sensitive test logic were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only Makefile changed; it updates APM verification/uv env vars and adds no manifests, controllers, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed Only Makefile changed; no OTE binary code or stdout/stderr behavior was modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only Makefile changed; no new Ginkgo e2e tests or network-sensitive code was added, so the check is not applicable.
No-Weak-Crypto ✅ Passed Only Makefile changed; it adds verify/apm targets and a CI env prefix, with no crypto primitives or secret comparisons introduced.
Container-Privileges ✅ Passed Only Makefile changed; no container/K8s manifests were added or modified, so no privileged settings were introduced.
No-Sensitive-Data-In-Logs ✅ Passed Only Makefile changed; added error text and a git-status check, with no passwords, tokens, PII, or internal hostnames logged.
✨ 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 commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: smg247

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 10, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

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 `@Makefile`:
- Line 53: Declare the verify target as phony by adding verify to the existing
.PHONY declaration in the Makefile, ensuring verify-origin and verify-apm always
run.
🪄 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: 128ff368-08f7-4a08-8221-137b3ff577d3

📥 Commits

Reviewing files that changed from the base of the PR and between 0f64c49 and b1b0e9d.

📒 Files selected for processing (1)
  • Makefile

Comment thread Makefile
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci openshift-ci Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jul 10, 2026
smg247 and others added 2 commits July 10, 2026 10:07
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@smg247

smg247 commented Jul 13, 2026

Copy link
Copy Markdown
Member Author

/retest

@smg247

smg247 commented Jul 13, 2026

Copy link
Copy Markdown
Member Author

/test verify

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@smg247

smg247 commented Jul 14, 2026

Copy link
Copy Markdown
Member Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
Makefile (1)

52-53: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Declare verify-apm as phony.

Because verify-apm is a prerequisite but not phony, a file or directory with that name can cause Make to skip the APM freshness check. Add it to the existing declaration.

Proposed fix
-.PHONY: verify-origin verify
+.PHONY: verify-origin verify verify-apm
🤖 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 `@Makefile` around lines 52 - 53, Add verify-apm to the existing .PHONY
declaration alongside verify-origin and verify, while preserving the current
verify target prerequisites.

Source: Coding guidelines

🤖 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.

Outside diff comments:
In `@Makefile`:
- Around line 52-53: Add verify-apm to the existing .PHONY declaration alongside
verify-origin and verify, while preserving the current verify target
prerequisites.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: dbb9342a-e8b1-49ac-ad57-8a331a32f1f6

📥 Commits

Reviewing files that changed from the base of the PR and between d241cca and fa6d1b2.

📒 Files selected for processing (1)
  • Makefile

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@smg247

smg247 commented Jul 14, 2026

Copy link
Copy Markdown
Member Author

/test verify

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@smg247

smg247 commented Jul 14, 2026

Copy link
Copy Markdown
Member Author

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2026
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. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants