Skip to content

ROX-28879: Update ScannerV2&Collector Konflux image checks#14827

Merged
msugakov merged 7 commits intomasterfrom
misha/reshuffle-konflux-images-checks
Apr 9, 2025
Merged

ROX-28879: Update ScannerV2&Collector Konflux image checks#14827
msugakov merged 7 commits intomasterfrom
misha/reshuffle-konflux-images-checks

Conversation

@msugakov
Copy link
Contributor

@msugakov msugakov commented Apr 1, 2025

Description

This follows up on #13502 in the light that some parts of the approach block the release as evidenced in https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1743438459477049?thread_ts=1742820121.886399&cid=C05TS9N0S7L.
There's also a discussion in https://github.com/stackrox/stackrox/pull/14825/files#r2022395918 (for the context).

This change can be reviewed by commits which I provided with descriptions.

The future plans are:

  • Change branch protection in master to respect the new place of the jobs.
  • Backport this to 4.6 and 4.7.
  • Make the jobs required in release-* branches so that there won't be a similar situation when someone could update pointers without checking the builds.

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

Just looking at CI.

@openshift-ci
Copy link

openshift-ci bot commented Apr 1, 2025

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

@msugakov msugakov changed the title TODO fix(ci): Update ScannerV2&Collector Konflux image checks Apr 1, 2025
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Apr 1, 2025

Images are ready for the commit at f0b706b.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.8.x-361-gf0b706bd30.

@codecov
Copy link

codecov bot commented Apr 1, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.95%. Comparing base (3aeb402) to head (f0b706b).
Report is 73 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #14827      +/-   ##
==========================================
+ Coverage   48.87%   48.95%   +0.08%     
==========================================
  Files        2547     2550       +3     
  Lines      186906   187222     +316     
==========================================
+ Hits        91347    91662     +315     
+ Misses      88323    88308      -15     
- Partials     7236     7252      +16     
Flag Coverage Δ
go-unit-tests 48.95% <ø> (+0.08%) ⬆️

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.

msugakov added 4 commits April 1, 2025 14:38
While "style" is not a perfect word for it, I see it a better place
for such checks in the spirit of ensuring consistency of the code.

Only used cut and paste, no other manual changes.
I don't see a reason why not have us notified when either of these
jobs fails.
@msugakov msugakov force-pushed the misha/reshuffle-konflux-images-checks branch from 0c419f3 to af62da7 Compare April 1, 2025 12:41
@msugakov msugakov marked this pull request as ready for review April 1, 2025 12:42
@msugakov msugakov added backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 backport-for-4.7-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1739787699448879 labels Apr 1, 2025
@msugakov msugakov changed the title fix(ci): Update ScannerV2&Collector Konflux image checks ROX-28879: Update ScannerV2&Collector Konflux image checks Apr 8, 2025
@openshift-ci
Copy link

openshift-ci bot commented Apr 8, 2025

@msugakov: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/gke-qa-e2e-tests f0b706b link false /test gke-qa-e2e-tests

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.

@msugakov
Copy link
Contributor Author

msugakov commented Apr 9, 2025

Deleted former check-collector-images-exist and check-collector-images-exist from requirements of the master branch.

@msugakov msugakov merged commit 7ea6887 into master Apr 9, 2025
88 of 104 checks passed
@msugakov msugakov deleted the misha/reshuffle-konflux-images-checks branch April 9, 2025 12:01
@msugakov
Copy link
Contributor Author

msugakov commented Apr 9, 2025

Hah. Unlucky timing. #14892 got auto-merged and now the checks aren't succeeding for master. https://github.com/stackrox/stackrox/actions/runs/14356583884/job/40247339497

@msugakov
Copy link
Contributor Author

msugakov commented Apr 9, 2025

I am working this around by doing the following

$ podman pull quay.io/rhacs-eng/scanner:2.36.x-31-g08a8cf1925-fast
$ podman tag quay.io/rhacs-eng/scanner:2.36.x-31-g08a8cf1925-fast quay.io/rhacs-eng/scanner:2.36.x-33-g26c2c627bd-fast
$ podman push quay.io/rhacs-eng/scanner:2.36.x-33-g26c2c627bd-fast

$ podman pull quay.io/rhacs-eng/scanner-db-slim:2.36.x-31-g08a8cf1925-fast
$ podman tag quay.io/rhacs-eng/scanner-db-slim:2.36.x-31-g08a8cf1925-fast quay.io/rhacs-eng/scanner-db-slim:2.36.x-33-g26c2c627bd-fast
$ podman push quay.io/rhacs-eng/scanner-db-slim:2.36.x-33-g26c2c627bd-fast

I know it's not good but I'm sure we'll have more SCANNER_VERSION updates before we get near to be releasing with Konflux.

@msugakov
Copy link
Contributor Author

msugakov commented Apr 9, 2025

Made these checks required for master.
image

msugakov added a commit that referenced this pull request Apr 9, 2025
@msugakov msugakov removed the backport-for-4.7-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1739787699448879 label Apr 9, 2025
@msugakov msugakov removed the backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 label Apr 9, 2025
ajheflin pushed a commit that referenced this pull request Jun 24, 2025
msugakov added a commit that referenced this pull request Jul 1, 2025
msugakov added a commit that referenced this pull request Jul 1, 2025
To the same effect as `git cherry-pick 7ea6887`.

Did not add `collector-slim` to the check list because there's no GHA
built image
`quay.io/rhacs-eng/collector-slim:<original-collector-version>`
and there's no Konflux build image
`quay.io/rhacs-eng/release-collector-slim:<original-collector-version>`
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.

3 participants