Skip to content

ROX-27060: Konflux Backporting for 4.6, Batch 3#15816

Merged
msugakov merged 16 commits intorelease-4.6from
patch-3/release-4.6
Jun 26, 2025
Merged

ROX-27060: Konflux Backporting for 4.6, Batch 3#15816
msugakov merged 16 commits intorelease-4.6from
patch-3/release-4.6

Conversation

@ajheflin
Copy link
Contributor

@ajheflin ajheflin commented Jun 24, 2025 •
edited by msugakov
Loading

Description

Obtained via:

git cherry-pick 8656f5a1 59215b9e a21135e6 3ec1499e a2d4ebdd 4240ca67 a7b8a0ad 7ff1ca86 1d4290bc cd107314 a9eb60ad 3bed6d0b 4d62eee1 e08de509 07de3d2d

@openshift-ci
Copy link

openshift-ci bot commented Jun 24, 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

@github-actions github-actions bot added ci-all-qa-tests Tells CI to run all API tests (not just BAT). area/helm area/operator area/postgres area/scanner area/ci backport PR to backport changes from master to release branch labels Jun 24, 2025
@ajheflin
Copy link
Contributor Author

ajheflin commented Jun 24, 2025 •
edited
Loading

This change is part of the following stack:

Change managed by git-spice.

This was referenced Jun 24, 2025
Merged
Merged
Merged
@ajheflin ajheflin added the konflux-build Run Konflux in PR. Push commit to trigger it. label Jun 24, 2025
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Jun 24, 2025 •
edited
Loading

Images are ready for the commit at 5c626b6.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.6.7-18-g5c626b60d0.

This was referenced Jun 24, 2025
Merged
Merged
@codecov
Copy link

codecov bot commented Jun 24, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.43%. Comparing base (cfc84ce) to head (5c626b6).
Report is 1 commits behind head on release-4.6.

Additional details and impacted files 
@@             Coverage Diff              @@
##           release-4.6   #15816   +/-   ##
============================================
  Coverage        48.43%   48.43%           
============================================
  Files             2470     2470           
  Lines           178528   178528           
============================================
  Hits             86465    86465           
  Misses           85111    85111           
  Partials          6952     6952
Flag Coverage Δ
go-unit-tests 48.43% <ø> (ø)

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 msugakov force-pushed the patch-2/release-4.6 branch from 2fa41d5 to 77e604b Compare June 25, 2025 10:27
Base automatically changed from patch-2/release-4.6 to release-4.6 June 25, 2025 13:14
@msugakov msugakov force-pushed the patch-3/release-4.6 branch from 81b4d42 to 9413c7e Compare June 25, 2025 13:18
@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

/retest roxctl-on-push

@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

/retest operator-on-push

@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

/retest scanner-v4-on-push

@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

/retest operator-bundle-on-push

@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

/cancel

msugakov and others added 11 commits June 25, 2025 19:35
@msugakov
ROX-2602: Prefactors for tagging support in Konflux (#13661)
f036831
@tommartensen @msugakov
ROX-27485: Add comment not to delete source-location LABEL (#13680)
207c42d 
Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
@msugakov
ROX-26026: Matrixize more jobs in .github/workflow/build.yaml (#13694)
5e82fbc
@msugakov
ROX-26026: Introduce registry to Scanner build matrix (#13695)
b4db434
@tommartensen @msugakov
ROX-23316: Create ACS-style snapshot for each new operator-bundle (#1…
2c6f4e4 
…3577)

Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
@msugakov
chore: Kill Java mentions from Konflux pipelines (#13745)
bfa2b1d
@tommartensen @msugakov
ROX-24530: let Konflux images expire after 13w (#13757)
3000bc6
@tommartensen @msugakov
ROX-23316: check: confirm all components are part of snapshot (#13748)
bfe0d08 
Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
@msugakov
ROX-27350: Switch retag-image task to the one in our bundle (#13761)
4fb9b11
@red-hat-konflux @msugakov
chore(deps): update quay.io/rhacs-eng/konflux-tasks:latest docker dig…
d8356fb 
…est to 098fb3f (master) (#13493)
@red-hat-konflux @msugakov
chore(deps): update konflux references (master) (#13477)
603e68d
@msugakov msugakov force-pushed the patch-3/release-4.6 branch from 9413c7e to 603e68d Compare June 25, 2025 17:35
@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025 •
edited
Loading

I force-pushed because we should not change COLLECTOR_VERSION (not yet).
I.e. I resolved the conflict differently in the cherry-pick of

ROX-27203: Ensure collector/scanner images exist during updates (#13502)

@msugakov
Remove mention scripts/reference/build-quay-operator-bundles.sh
5c626b6 
from shellcheck skip-list to aid failing CI.
See https://github.com/stackrox/stackrox/actions/runs/15883188504/job/44788581256?pr=15816#step:7:7375

This follows up deletions cherry-picked from #13661
I wonder why it did not fail there.
@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

/retest roxctl-on-push

@msugakov msugakov marked this pull request as ready for review June 25, 2025 18:22
@msugakov msugakov requested review from a team as code owners June 25, 2025 18:22
@msugakov msugakov requested review from porridge and removed request for a team June 25, 2025 18:22
@stackrox stackrox deleted a comment from openshift-ci bot Jun 25, 2025
@msugakov
Copy link
Contributor

msugakov commented Jun 26, 2025

/retest scanner-v4-on-push

@stackrox stackrox deleted a comment from openshift-ci bot Jun 26, 2025
@msugakov
Copy link
Contributor

msugakov commented Jun 26, 2025

/test gke-sensor-integration-tests gke-scanner-v4-tests ocp-4-12-scanner-v4-tests

@msugakov
Copy link
Contributor

msugakov commented Jun 26, 2025

/test gke-scanner-v4-tests

msugakov
msugakov approved these changes Jun 26, 2025
View reviewed changes
Copy link
Contributor

@msugakov msugakov left a comment •
edited
Loading

Choose a reason for hiding this comment

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

gke-scanner-v4-tests errors are the same as before backporting. I'll report them separately. This is good to go.

https://redhat-internal.slack.com/archives/CFMQ5C2TT/p1750950965528869

@msugakov msugakov merged commit 89513fd into release-4.6 Jun 26, 2025
107 of 116 checks passed
@msugakov msugakov deleted the patch-3/release-4.6 branch June 26, 2025 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@msugakov msugakov msugakov approved these changes

@tommartensen tommartensen Awaiting requested review from tommartensen

@porridge porridge Awaiting requested review from porridge porridge is a code owner automatically assigned from stackrox/install

Assignees

No one assigned

Labels

area/ci area/helm area/operator area/postgres area/scanner backport PR to backport changes from master to release branch ci-all-qa-tests Tells CI to run all API tests (not just BAT). konflux-build Run Konflux in PR. Push commit to trigger it.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ajheflin @rhacs-bot @msugakov @tommartensen