Skip to content

ROX-28879: Update ScannerV2&Collector Konflux image checks/4.7#14941

Merged
dcaravel merged 1 commit intorelease-4.7from
misha/ROX-28879-backport-image-presence-checks-4.7
Apr 29, 2025
Merged

ROX-28879: Update ScannerV2&Collector Konflux image checks/4.7#14941
dcaravel merged 1 commit intorelease-4.7from
misha/ROX-28879-backport-image-presence-checks-4.7

Conversation

@msugakov
Copy link
Contributor

@msugakov msugakov commented Apr 9, 2025 •
edited
Loading

Description

Cherry-picked from 7ea6887 (#14827) to release-4.7.

Trying to figure when it's comfortable to merge the change in https://redhat-internal.slack.com/archives/C08CG1N8HBP/p1744214856614999

User-facing documentation

  • CHANGELOG is updated OR update is not needed
  • documentation PR is created and is linked above OR is not needed

Testing and quality

  • the change is production ready: the change is GA or otherwise the functionality is gated by a feature flag
  • CI results are inspected

Automated testing

No change.

How I validated my change

Only looking at CI.

Summary by Sourcery

Consolidate and improve GitHub Actions workflows for checking Collector and Scanner image availability

CI:

  • Refactored image existence checks for Collector and Scanner images in GitHub Actions workflows
  • Combined separate image existence check jobs into a single, more comprehensive workflow job

Chores:

  • Updated GitHub Actions workflow configuration to streamline image verification process

@sourcery-ai
Copy link
Contributor

sourcery-ai bot commented Apr 9, 2025

Reviewer's Guide by Sourcery

This PR consolidates the image existence checks for Collector and Scanner into a single workflow in style.yaml. The previous checks in build.yaml were removed. The new workflow verifies the existence of both GHA-built and Konflux-built images for the specified components.

No diagrams generated as the changes look simple and do not need a visual representation.

File-Level Changes

Change Details Files
Consolidated image existence checks for Collector and Scanner into a single workflow.
  • Removed the check-collector-images-exist job from build.yaml.
  • Removed the check-scanner-images-exist job from build.yaml.
  • Added a new job check-collector-and-scanner-images-exist to style.yaml.
  • The new job checks for the existence of both GHA-built and Konflux-built images for collector and scanner.
  • The new job uses a matrix strategy to check for collector, scanner, scanner-slim, scanner-db, and scanner-db-slim images.
  • The new job retrieves the image tag from the COLLECTOR_VERSION or SCANNER_VERSION file.
  • The new job checks for the existence of images with and without the -fast suffix.
 .github/workflows/build.yaml
.github/workflows/style.yaml
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!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

@github-actions github-actions bot added area/ci backport PR to backport changes from master to release branch labels Apr 9, 2025
@msugakov
Copy link
Contributor Author

msugakov commented Apr 9, 2025

Having to backport collector 3.21.0 as 3.21.1 (technically it's the same commit) due to the absence of the latter:

$ podman pull quay.io/rhacs-eng/collector:3.21.0-fast
$ podman tag quay.io/rhacs-eng/collector:3.21.0-fast quay.io/rhacs-eng/collector:3.21.1-fast
$ podman push quay.io/rhacs-eng/collector:3.21.1-fast

@msugakov
Copy link
Contributor Author

msugakov commented Apr 9, 2025

/retest retag-collector

@stackrox stackrox deleted a comment from openshift-ci bot Apr 9, 2025
@msugakov msugakov requested a review from tommartensen April 9, 2025 16:07
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Apr 9, 2025

Images are ready for the commit at de3ecf5.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.2-rc.3-1-gde3ecf57ce.

@msugakov msugakov requested a review from davdhacs April 9, 2025 16:30
@codecov
Copy link

codecov bot commented Apr 9, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.07%. Comparing base (1ad9c47) to head (de3ecf5).
Report is 2 commits behind head on release-4.7.

Additional details and impacted files 
@@             Coverage Diff              @@
##           release-4.7   #14941   +/-   ##
============================================
  Coverage        49.07%   49.07%           
============================================
  Files             2515     2515           
  Lines           182893   182893           
============================================
+ Hits             89746    89747    +1     
+ Misses           86027    86025    -2     
- Partials          7120     7121    +1
Flag Coverage Δ
go-unit-tests 49.07% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@tommartensen tommartensen added this to the 4.7.3-rc.1 milestone Apr 10, 2025
tommartensen
tommartensen approved these changes Apr 11, 2025
View reviewed changes
Copy link
Contributor

@tommartensen tommartensen left a comment

Choose a reason for hiding this comment

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

LGTM, but don't merge until 4.7.2 is out.

@msugakov msugakov requested a review from dcaravel April 23, 2025 17:00
@msugakov
Copy link
Contributor Author

msugakov commented Apr 23, 2025

@dcaravel please merge this one for 4.7.3.

@dcaravel dcaravel merged commit 758b50b into release-4.7 Apr 29, 2025
95 of 110 checks passed
@dcaravel dcaravel deleted the misha/ROX-28879-backport-image-presence-checks-4.7 branch April 29, 2025 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tommartensen tommartensen tommartensen approved these changes

@davdhacs davdhacs Awaiting requested review from davdhacs

@dcaravel dcaravel Awaiting requested review from dcaravel

Assignees

No one assigned

Labels

area/ci backport PR to backport changes from master to release branch

Projects

None yet

Milestone

4.7.3-rc.1

Development

Successfully merging this pull request may close these issues.

4 participants

@msugakov @rhacs-bot @tommartensen @dcaravel