Skip to content

Fix approved-image option in manifests target & fix GHA artifact name - #337

Merged
Jakob-Naucke merged 2 commits into
trusted-execution-clusters:mainfrom
Jakob-Naucke:manifests-option
Aug 17, 2026
Merged

Fix approved-image option in manifests target & fix GHA artifact name#337
Jakob-Naucke merged 2 commits into
trusted-execution-clusters:mainfrom
Jakob-Naucke:manifests-option

Conversation

@Jakob-Naucke

@Jakob-Naucke Jakob-Naucke commented Aug 14, 2026

Copy link
Copy Markdown
Member

Summary by Sourcery

Ensure integration test artifacts are named correctly in GitHub Actions and update the manifests target to pass the approved image with the required prefix.

Build:

  • Adjust the manifests Makefile target to include the required image prefix when passing the approved image.

CI:

  • Fix the must-gather artifact name in the integration-tests GitHub Actions workflow to use the environment-provided branch reference.

Signed-off-by: Jakob Naucke <jnaucke@redhat.com>
@sourcery-ai

sourcery-ai Bot commented Aug 14, 2026

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR fixes the must-gather artifact naming in the integration test GitHub workflow and corrects the approved-image argument passed from the Makefile to the manifests generation script to include the required coreos prefix.

Flow diagram for manifests target approved-image argument change

flowchart LR
    Dev[Developer runs make manifests] --> M[Makefile manifests target]
    M --> G[generate target]
    G --> S[manifests generation script]
    S --> A["approved-image coreos,$(APPROVED_IMAGE)"]
Loading

File-Level Changes

Change Details Files
Fix GitHub Actions must-gather artifact name so it correctly uses the GITHUB_HEAD_REF environment variable.
  • Change upload-artifact name interpolation from shell-style ${GITHUB_HEAD_REF} to GitHub Actions expression syntax using ${{ env.GITHUB_HEAD_REF }}
  • Ensure the must-gather artifact is named based on the head ref from the job environment rather than relying on an unexpanded variable
.github/workflows/integration-tests.yml
Update manifests Makefile target to pass a correctly formatted approved-image value including the coreos prefix.
  • Modify the approved-image flag to prepend the fixed value coreos, to whatever is in $(APPROVED_IMAGE)
  • Align the Makefile manifests target with the expected approved-image format used by the generator script or downstream tooling
Makefile

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai 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.

Hey - I've left some high level feedback:

  • In the GitHub workflow, consider using ${{ github.head_ref }} directly in the artifact name rather than ${{ env.GITHUB_HEAD_REF }} unless there’s a specific need for the indirection, which simplifies the configuration.
  • In the manifests target, adding coreos, directly before $(APPROVED_IMAGE) could produce a trailing comma when APPROVED_IMAGE is empty; consider guarding against empty values or constructing the list dynamically.
  • If coreos is intended to be a configurable approved image rather than always included, consider making this prefix parameterized (e.g., via a variable) instead of hardcoding it into the Makefile target.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In the GitHub workflow, consider using `${{ github.head_ref }}` directly in the artifact name rather than `${{ env.GITHUB_HEAD_REF }}` unless there’s a specific need for the indirection, which simplifies the configuration.
- In the `manifests` target, adding `coreos,` directly before `$(APPROVED_IMAGE)` could produce a trailing comma when `APPROVED_IMAGE` is empty; consider guarding against empty values or constructing the list dynamically.
- If `coreos` is intended to be a configurable approved image rather than always included, consider making this prefix parameterized (e.g., via a variable) instead of hardcoding it into the Makefile target.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Signed-off-by: Jakob Naucke <jnaucke@redhat.com>
@SpaceFace02

Copy link
Copy Markdown
Member

lgtm

@openshift-ci

openshift-ci Bot commented Aug 17, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Jakob-Naucke, SpaceFace02

The full list of commands accepted by this bot can be found 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

@Jakob-Naucke
Jakob-Naucke merged commit b31be0d into trusted-execution-clusters:main Aug 17, 2026
14 of 15 checks passed
@Jakob-Naucke
Jakob-Naucke deleted the manifests-option branch August 17, 2026 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants