Backport konflux changes to 3.20 (stackrox 4.6) #2176
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Molter73
force-pushed
the
mauro/konflux-backport-3.20
branch
from
207eaf2 to
255ce9a
Compare
Molter73
force-pushed
the
mauro/konflux-backport-3.20
branch
from
255ce9a to
59c1e4a
Compare
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…latest docker digest to 81c4864 (#1882)
Since konflux always builds multiarch images and we always try to test them, we should force the test container to build in multiarch mode. If we don't, then we get test failures on the konflux integration tests for PRs due to the tester image not existing.
…latest docker digest to 52f1391 (master) (#1982)
…ux Dockerfiles (#2002) * Add comment not to delete source-location LABEL from Konflux Dockerfiles * Update collector/container/konflux.Dockerfile Co-authored-by: Misha Sugakov <[email protected]> --------- Co-authored-by: Misha Sugakov <[email protected]>
…est to 098fb3f (master) (#2003)
…est to 433e2a1 (master) (#2009)
…est to fa86065 (#2119) Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>
… to Konflux pipelines (#2115)
…est to b4f8de3 (#2136) Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Molter73
force-pushed
the
mauro/konflux-backport-3.20
branch
from
59c1e4a to
8d9cc13
Compare
msugakov
approved these changes
Jun 23, 2025
Stringy
approved these changes
Jun 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The list of commits to add into the branch was retrieved with the following command:
git log --oneline release-3.20...master -- rpms.* .tekton .konflux .github/workflows/konflux.yml collector/container/konflux.Dockerfile .github/CODEOWNERS .syft.yamlThe commits were then cherry-picked by reverting the list in neovim like this:
Had to manually remove some commits from the command because they either had already been cherry-picked on a previous PR and were producing empty commits or the changed themselves were not needed for konflux (i.e updating a dependency that shouldn't be updated in this release needed changes on the konflux dockerfile).
Checklist
Automated testing
If any of these don't apply, please comment below.
Testing Performed
CI builds konflux images and runs tests on them correctly.