Skip to content

SRVLOGIC-1158: Differentiate Quarkus core and platform version - #466

Open
domhanak wants to merge 14 commits into
kubesmarts:mainfrom
domhanak:SRVLOGIC-1158
Open

domhanak wants to merge 14 commits into
kubesmarts:mainfrom
domhanak:SRVLOGIC-1158

Conversation

@domhanak

@domhanak domhanak commented Aug 28, 2026 •

Copy link
Copy Markdown

https://redhat.atlassian.net/browse/SRVLOGIC-1158

Cherry-picks 465 to main

run standard e2e
run operator e2e

@domhanak
domhanak marked this pull request as draft August 28, 2026 07:52
@domhanak
domhanak marked this pull request as ready for review August 28, 2026 07:52
Comment thread .github/supporting-files/ci/osl/.env Outdated
QUARKUS_PLATFORM_version=3.33.3
QUARKUS_VERSION=3.33.3
QUARKUS_PLATFORM_version=3.33.2.SP2-redhat-00002
QUARKUS_VERSION=3.33.2.redhat-00008

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

will be adjusted once we have a proof of this working

@domhanak

domhanak commented Aug 28, 2026 •

Copy link
Copy Markdown
Author

So builder image for example built well:
2026-08-28T08:22:41.7325380Z �[32m2026-08-28 08:22:41,729 docker_builder.py:108 INFO Docker: Step 54/74 : ENV KOGITO_VERSION="111-SNAPSHOT" QUARKUS_PLATFORM_GROUPID="com.redhat.quarkus.platform" QUARKUS_PLATFORM_VERSION="3.33.2.SP2-redhat-00002" QUARKUS_VERSION="3.33.2.redhat-00008" SONATAFLOW_QUARKUS_DEVUI_VERSION="111-SNAPSHOT"�[0m

Looking into the test failures that follow

@domhanak

Copy link
Copy Markdown
Author

Ok so test needs to be adjusted:
Exception: File /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom does not exist

fyi @jakubschwan

@domhanak

Copy link
Copy Markdown
Author

Adjusted tests, applied new lables ( some are still missing, working on that ), adjusted quarkus-mvn-plugin.sh

@domhanak
domhanak requested a review from jakubschwan August 28, 2026 10:49
@domhanak

Copy link
Copy Markdown
Author

Still couple of fixes needed, will santize here and port to 9.106.x-prod after

@domhanak domhanak changed the title SRVLOGIC-1158: Attempt to differentiate Quarkus core and platform version SRVLOGIC-1158: Differentiate Quarkus core and platform version Aug 31, 2026
@domhanak

Copy link
Copy Markdown
Author

Okay, just some instabilities left and operator e2e. Working on those

@domhanak

Copy link
Copy Markdown
Author

Comparing to https://github.com/kubesmarts/kie-tools/pull/451/changes#diff-0f93e9e480131c2502d82d564b801a60fee9d430632d0bd490c843805fb7fabb we still need to check some workflow plugin e2e. Working on it.

@wmedvede wmedvede left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I added some minor comments that I think can be worth to take a second look at.

Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
When container is started with command bash
Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom should exist and be a directory
Then file /home/kogito/.m2/repository/com/redhat/quarkus/platform/quarkus-bom should exist and be a directory

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

So from now, this will only work wuen using the RH quarkus platform?
I'm confused with this line here https://github.com/kubesmarts/kie-tools/pull/466/changes#diff-70f308b794edcd370a6aaadeb47dfaca08e14bb5e2c6c3b7d864fddb97abf3c8L38

That says:

# Defines the value of used quarkus platform. For CI checks to work it needs to remain on community value
# otherwise the build of container images is going to fail since "com.redhat.quarkus.platform" is only
# available in "maven.repository.redhat.com"
KOGITO_IMAGES_CEKIT_MODULES__quarkusGroupId=io.quarkus.platform
KOGITO_IMAGES_CEKIT_MODULES__quarkusGroupId=com.redhat.quarkus.platform

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

That needs updating, but yes we want to test against productized Quarkus

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Not sure how this will be, I mean, are you also going to force kogito-runtines and kogito-apps to work with productized Quarkus? Because AFAIK, we need all the stack aligned with the same Quarkus version.

if [[ -n "${QUARKUS_VERSION}" && "${QUARKUS_VERSION}" != \#\#\#* ]]; then
quarkus_version="${QUARKUS_VERSION}"
else
quarkus_version="${QUARKUS_PLATFORM_VERSION}"

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

this fallback to QUARKUS_PLATFORM_VERSION I'm not sure if good 🤔
Since below, it's being used e.g. to complete the version when adding a quarkus extension when the version is missing, see:

https://github.com/kubesmarts/kie-tools/pull/466/changes#diff-33d82cd0e94d4c7820db405f666767e43d33e83d2032911c854505cffe73a902L51

we have basically:

    # If the version is missing, append the default version based on the groupId
    if [ -z "$version" ]; then
        if [[ "$group_id" == "io.quarkus" ]]; then
            extension="${group_id}:${artifact_id}:${quarkus_version}"
        elif [[ "$group_id" == *"kie"* || "$group_id" == *"kogito"* || "$artifact_id" == *"kogito"* || "$artifact_id" == *"sonataflow"* ]]; then
            extension="${group_id}:${artifact_id}:${kogito_version}"
        fi
    fi

but, an io.quarkus extension will never have a QUARKUS_PLATFORM_VERSION like 3.33.2.SP2-redhat-00002 I think. Since that numer is only for the platform, but not for the inner extensions.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yes, correct. Will double check then, I was not aware it is doing this

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

In general the fallback is here in case the QUARKUS_PLATFORM_VERSION=QUARKUS_VERSION we do not need to have 2 variables, however I would vote to always have them set.

@@ -166,10 +169,20 @@ def update_quarkus_platform_version(quarkus_platform_version):
Update quarkus_platform_version version into images/modules
:param quarkus_platform_version: quarkus version to set

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Suggested change
:param quarkus_platform_version: quarkus version to set
:param quarkus_platform_version: quarkus platform version to set

parser.add_argument('--source-folder', dest='source_folder')
parser.add_argument('--quarkus-groupid', dest='quarkus_groupid', help='Sets the image Quarkus groupId')
parser.add_argument('--quarkus-version', dest='quarkus_version', help='Sets the image Quarkus Version')
parser.add_argument('--quarkus-version', dest='quarkus_version', help='Sets the image Quarkus Platform Version')

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Suggested change
parser.add_argument('--quarkus-version', dest='quarkus_version', help='Sets the image Quarkus Platform Version')
parser.add_argument('--quarkus-version', dest='quarkus_version', help='Sets the image Quarkus Version')

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants