Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.13.x] - Update 2.13 to use the new container images #31001

Merged
merged 2 commits into from
May 16, 2023

Conversation

cescoffier
Copy link
Member

Update the Quarkus images to multi-archs variants

  • the builder images are now: quarkusubi-quarkus-graalvmce-builder-image and quarkusubi-quarkus-mandrel-builder-image. Both at multi-archs (AMD64 and ARM64).
  • the s2i images are now: quarkusubi-quarkus-native-binary-s2i:2.0 and quarkusubi-quarkus-graalvmce-s2i
  • the base images are now: quarkusquarkus-micro-image:2.0 and quarkusquarkus-distroless-image:2.0

@quarkus-bot quarkus-bot bot added area/core area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/documentation area/infra-automation anything related to CI, bots, etc. that are used to automated our infrastructure area/platform Issues related to definition and interaction with Quarkus Platform labels Feb 8, 2023
@cescoffier cescoffier added triage/backport-2.13 and removed area/documentation area/core area/platform Issues related to definition and interaction with Quarkus Platform area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/infra-automation anything related to CI, bots, etc. that are used to automated our infrastructure labels Feb 8, 2023
@cescoffier cescoffier changed the title Update 2.13 to use the new container images [2.13.x] - Update 2.13 to use the new container images Feb 8, 2023
@quarkus-bot quarkus-bot bot added area/core area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/documentation area/infra-automation anything related to CI, bots, etc. that are used to automated our infrastructure area/platform Issues related to definition and interaction with Quarkus Platform labels Feb 8, 2023
@rsvoboda
Copy link
Member

rsvoboda commented Feb 8, 2023

There is #30829 concern for S2I with the new images.

Can you check it @cescoffier pls?

@quarkus-bot

This comment has been minimized.

@gsmet gsmet added this to the 2.13.8.Final milestone May 15, 2023
@gsmet
Copy link
Member

gsmet commented May 15, 2023

@rsvoboda AFAICS, #30829 has been addressed. Should we merge?

@rsvoboda
Copy link
Member

In general we are moving to the new generation of builder images in 2.13 and I think we should be ok with that. But it's better to be safe, so I will check with my team mates.

@gsmet
Copy link
Member

gsmet commented May 15, 2023

Let me fix the conflicts.

- the builder images are now: quarkusubi-quarkus-graalvmce-builder-image and quarkusubi-quarkus-mandrel-builder-image. Both at multi-archs (AMD64 and ARM64).
- the s2i images are now: quarkusubi-quarkus-native-binary-s2i:2.0 and quarkusubi-quarkus-graalvmce-s2i
- the base images are now: quarkusquarkus-micro-image:2.0 and quarkusquarkus-distroless-image:2.0
@gsmet gsmet force-pushed the migrate-to-new-images branch from 4e761f6 to 034a084 Compare May 15, 2023 12:57
@gsmet
Copy link
Member

gsmet commented May 15, 2023

Conflicts fixed.

Copy link
Member

@rsvoboda rsvoboda left a comment

Choose a reason for hiding this comment

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

There are also 2 other places that are using 1.14 version

integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.jvm:FROM registry.access.redhat.com/ubi8/openjdk-11:1.14
integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.legacy-jar:FROM registry.access.redhat.com/ubi8/openjdk-11:1.14

I think all the versions of openjdk image should be synced (even though these are just tests and main is also using older 1.14)

@@ -15,7 +15,7 @@ public class S2iConfig {

public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.14";
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be openjdk-11:1.15 like in 2 other cases?

@@ -15,7 +15,7 @@ public class S2iConfig {

public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.14";
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.14";
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be openjdk-17:1.15 like in 2 other cases?

Copy link
Member

Choose a reason for hiding this comment

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

It should and that's concerning as it looks like the previous backport didn't change them. I need to have a closer look.

Copy link
Member

Choose a reason for hiding this comment

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

It looks like we are using a floating tag for these 2 in main so that's why they weren't updated in main and thus not backported.
I'll go fix that in an additional commit.

@quarkus-bot
Copy link

quarkus-bot bot commented May 15, 2023

Failing Jobs - Building 8aca0ac

Status Name Step Failures Logs Raw logs
Gradle Tests - JDK 11 Build Failures Logs Raw logs
Gradle Tests - JDK 11 Windows Build Failures Logs Raw logs

Full information is available in the Build summary check run.

Failures

⚙️ Gradle Tests - JDK 11 #

- Failing: integration-tests/gradle 

📦 integration-tests/gradle

io.quarkus.gradle.devmode.AvroDevModeTest.main line 15 - More details - Source on GitHub

org.awaitility.core.ConditionTimeoutException: Condition with lambda expression in io.quarkus.test.devmode.util.DevModeTestUtils that uses java.util.function.Supplier, java.util.function.Supplierjava.util.concurrent.atomic.AtomicReference, java.util.concurrent.atomic.AtomicReferencejava.lang.String, java.lang.Stringboolean was not fulfilled within 1 minutes.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.CallableCondition.await(CallableCondition.java:78)

⚙️ Gradle Tests - JDK 11 Windows #

- Failing: integration-tests/gradle 

📦 integration-tests/gradle

io.quarkus.gradle.ConditionalDependenciesTest.scenarioTwo line 147 - More details - Source on GitHub

java.lang.AssertionError: 

Expecting path:

io.quarkus.gradle.devmode.MultiSourceProjectDevModeTest.main line 22 - More details - Source on GitHub

org.awaitility.core.ConditionTimeoutException: Condition with lambda expression in io.quarkus.test.devmode.util.DevModeTestUtils that uses java.util.function.Supplier, java.util.function.Supplierjava.util.concurrent.atomic.AtomicReference, java.util.concurrent.atomic.AtomicReferencejava.lang.String, java.lang.Stringboolean was not fulfilled within 1 minutes.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.CallableCondition.await(CallableCondition.java:78)

Copy link
Member

@rsvoboda rsvoboda left a comment

Choose a reason for hiding this comment

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

Thanks for update @gsmet. I spoke with people in the team and we have no objections.

@gsmet gsmet merged commit 6dbc829 into quarkusio:2.13 May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/core area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/documentation area/infra-automation anything related to CI, bots, etc. that are used to automated our infrastructure area/platform Issues related to definition and interaction with Quarkus Platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants