Skip to content

ROX-26026: Support tagged Konflux builds#13422

Closed
msugakov wants to merge 13 commits intomasterfrom
misha/ROX-26026-konflux-tagged-builds
Closed

ROX-26026: Support tagged Konflux builds#13422
msugakov wants to merge 13 commits intomasterfrom
misha/ROX-26026-konflux-tagged-builds

Conversation

@msugakov
Copy link
Contributor

Description

change me!

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

  • added unit tests
  • added e2e tests
  • added regression tests
  • added compatibility tests
  • modified existing tests

How I validated my change

change me!

@openshift-ci
Copy link

openshift-ci bot commented Nov 25, 2024

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 force-pushed the misha/ROX-26026-konflux-tagged-builds branch from 1456d00 to 8fab87f Compare November 25, 2024 13:59
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Nov 25, 2024

Images are ready for the commit at d328324.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.x-254-gd328324830.

@msugakov msugakov force-pushed the misha/ROX-26026-konflux-tagged-builds branch from 8fab87f to e37acf8 Compare November 25, 2024 15:49
@msugakov msugakov added the backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 label Dec 5, 2024
Versions like 3.0.62.3 are long gone and are not coming back, we
don't need to keep the code which strips out the .0 on the second
position.
This was the case before I came but I was still first surprised that
my `misha-test-1` tag push triggered `release-ci.yaml`.
There I couldn't quickly figure if things would indeed be released.
not because 8 wasn't good.
There are multiple things:

1. Used `|` multiline string because otherwise GoLand drops
   indentation on reformatting.
2. Made `retag-` CEL expressions identical with others.
3. Added `release-` for both PR and push events. It's no-op in
   `master` but it allows having identical CEL expressions in both
   release and master branches. Less diff -> less chances for
   mistakes.
It's not used in the Dockerfile so we don't need to pass it.
Externally determined version gets injected in the BUILD_TAG so that
builds use that and don't try to do their own `make tag` thingy which
won't give them correct results for tagged builds.
This does the simplest part of
https://issues.redhat.com/browse/ROX-27230

The reason it's needed here is because of the commit that follows.
`MAIN_TAG_SUFFIX` became redundant the moment we start injecting
`BUILD_TAG`.

Two others, i.e. `COLLECTOR_TAG_SUFFIX` and `SCANNER_TAG_SUFFIX`
will be used only when the image flavor is `development_build`
and when it's not a release build. We know Konflux builds are
release builds since #13348.
We also know that Konflux builds will have `rhacs` image flavor and
that one relies on the unified tagging, i.e. only `BUILD_TAG` is
needed and `COLLECTOR_TAG_SUFFIX` and `SCANNER_TAG_SUFFIX` aren't.

I thought it's good to be a bit aggressive removing environment
variables because there's a lot of them already and dragging around
unused ones is worse than leaving them for the future when we'll be
onboarding non-release `development_build`-s on Konflux as a daily
driver. Besides, that future might look very differently (e.g. we may
want to have unified Dockerfiles).
building in Konflux, because the former one failed.
Simplified a couple of loops because it has been long since we
pushed to multiple repos at once and I'm not sure we'll need it
again.
so that later we can more easily disable the ones for RHACS_BRANDING.
@msugakov msugakov removed the backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 label Jan 17, 2025
@msugakov
Copy link
Contributor Author

I think everything that could have been extracted from this PR, was extracted and likely referenced. I'm closing this PR.

@msugakov msugakov closed this Jan 27, 2025
@msugakov msugakov deleted the misha/ROX-26026-konflux-tagged-builds branch September 10, 2025 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants