From 3477c460c3e809872163661f5e2a6cab9138b29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Fri, 28 Apr 2023 18:48:41 +0200 Subject: [PATCH] Refactor external apps with Quarkus snapshot --- .../io/quarkus/qe/DevModeQuickstartUsingDefaultsIT.java | 6 +----- ...penShiftContainerRegistryQuickstartUsingDefaultsIT.java | 2 -- ...sIT.java => OpenShiftExtensionCamelFileBindyFtpIT.java} | 7 +++++-- ...ensionUsingDockerBuildStrategyCamelFileBindyFtpIT.java} | 7 +++++-- .../quarkus/qe/OpenShiftS2iQuickstartUsingDefaultsIT.java | 2 -- .../quarkus/qe/OpenShiftS2iQuickstartUsingUberJarIT.java | 5 +---- .../src/test/java/io/quarkus/qe/OpenShiftTodoDemoIT.java | 6 ++---- .../test/java/io/quarkus/qe/QuickstartUsingDefaultsIT.java | 6 +----- .../java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java | 6 +----- quarkus-test-openshift/src/main/resources/settings-mvn.yml | 4 ++-- 10 files changed, 18 insertions(+), 33 deletions(-) rename examples/external-applications/src/test/java/io/quarkus/qe/{OpenShiftExtensionQuickstartUsingDefaultsIT.java => OpenShiftExtensionCamelFileBindyFtpIT.java} (64%) rename examples/external-applications/src/test/java/io/quarkus/qe/{OpenShiftExtensionUsingDockerBuildStrategyQuickstartUsingDefaultsIT.java => OpenShiftExtensionUsingDockerBuildStrategyCamelFileBindyFtpIT.java} (63%) diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/DevModeQuickstartUsingDefaultsIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/DevModeQuickstartUsingDefaultsIT.java index 520264b45..e78c47e6c 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/DevModeQuickstartUsingDefaultsIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/DevModeQuickstartUsingDefaultsIT.java @@ -8,18 +8,14 @@ import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; -import io.quarkus.test.scenarios.annotations.EnabledOnQuarkusVersion; import io.quarkus.test.services.GitRepositoryQuarkusApplication; @QuarkusScenario -// TODO: remove when Quarkus QuickStarts migrates to Quarkus 3 -@EnabledOnQuarkusVersion(version = "999-SNAPSHOT", reason = "QuickStarts on development branch uses 999-SNAPSHOT") @DisabledOnNative @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support long file paths") public class DevModeQuickstartUsingDefaultsIT { - // TODO: switch to main branch when Quarkus QuickStarts migrates to Quarkus 3 - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", branch = "development", contextDir = "getting-started", devMode = true) + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", contextDir = "getting-started", devMode = true) static final RestService app = new RestService(); @Test diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftContainerRegistryQuickstartUsingDefaultsIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftContainerRegistryQuickstartUsingDefaultsIT.java index a18e65917..caef827fe 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftContainerRegistryQuickstartUsingDefaultsIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftContainerRegistryQuickstartUsingDefaultsIT.java @@ -2,9 +2,7 @@ import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; -@DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingContainerRegistry) public class OpenShiftContainerRegistryQuickstartUsingDefaultsIT extends QuickstartUsingDefaultsIT { diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionQuickstartUsingDefaultsIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionCamelFileBindyFtpIT.java similarity index 64% rename from examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionQuickstartUsingDefaultsIT.java rename to examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionCamelFileBindyFtpIT.java index f872932a6..5a0b2ce1e 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionQuickstartUsingDefaultsIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionCamelFileBindyFtpIT.java @@ -7,11 +7,14 @@ import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; +import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion; import io.quarkus.test.services.GitRepositoryQuarkusApplication; -@DisabledOnQuarkusSnapshot(reason = "'io.quarkus:quarkus-camel-bom:pom:999-SNAPSHOT' is not available in the Maven repositories") +// TODO: enable test when Camel Quarkus Examples migrate to Quarkus 3.0 +@DisabledOnQuarkusVersion(version = "(3\\.[0-9]\\..*)", reason = "Camel Quarkus Examples is using Quarkus 2.16") +@DisabledOnQuarkusSnapshot(reason = "Camel Quarkus 999-SNAPSHOT is not available in maven repository") // f.e. 'quarkus-camel-bom:pom:999-SNAPSHOT' is not available @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) -public class OpenShiftExtensionQuickstartUsingDefaultsIT { +public class OpenShiftExtensionCamelFileBindyFtpIT { @GitRepositoryQuarkusApplication(repo = "https://github.com/apache/camel-quarkus-examples.git", contextDir = "file-bindy-ftp", mavenArgs = "-Dopenshift") static final RestService app = new RestService(); diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionUsingDockerBuildStrategyQuickstartUsingDefaultsIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionUsingDockerBuildStrategyCamelFileBindyFtpIT.java similarity index 63% rename from examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionUsingDockerBuildStrategyQuickstartUsingDefaultsIT.java rename to examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionUsingDockerBuildStrategyCamelFileBindyFtpIT.java index 7e6be6964..cad3734c3 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionUsingDockerBuildStrategyQuickstartUsingDefaultsIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftExtensionUsingDockerBuildStrategyCamelFileBindyFtpIT.java @@ -7,11 +7,14 @@ import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; +import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion; import io.quarkus.test.services.GitRepositoryQuarkusApplication; -@DisabledOnQuarkusSnapshot(reason = "'io.quarkus:quarkus-camel-bom:pom:999-SNAPSHOT' is not available in the Maven repositories") +// TODO: enable test when Camel Quarkus Examples migrate to Quarkus 3.0 +@DisabledOnQuarkusVersion(version = "(3\\.[0-9]\\..*)", reason = "Camel Quarkus Examples is using Quarkus 2.16") +@DisabledOnQuarkusSnapshot(reason = "Camel Quarkus 999-SNAPSHOT is not available in maven repository") // f.e. 'quarkus-camel-bom:pom:999-SNAPSHOT' is not available @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) -public class OpenShiftExtensionUsingDockerBuildStrategyQuickstartUsingDefaultsIT { +public class OpenShiftExtensionUsingDockerBuildStrategyCamelFileBindyFtpIT { @GitRepositoryQuarkusApplication(repo = "https://github.com/apache/camel-quarkus-examples.git", contextDir = "file-bindy-ftp", mavenArgs = "-Dopenshift") static final RestService app = new RestService(); diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingDefaultsIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingDefaultsIT.java index 5dc080657..37bc057f2 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingDefaultsIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingDefaultsIT.java @@ -1,9 +1,7 @@ package io.quarkus.qe; import io.quarkus.test.scenarios.OpenShiftScenario; -import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; -@DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") @OpenShiftScenario public class OpenShiftS2iQuickstartUsingDefaultsIT extends QuickstartUsingDefaultsIT { diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingUberJarIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingUberJarIT.java index 40e3625ab..4f2d81920 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingUberJarIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingUberJarIT.java @@ -6,19 +6,16 @@ import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; -import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; import io.quarkus.test.services.GitRepositoryQuarkusApplication; @DisabledOnNative(reason = "This is to verify uber-jar, so it does not make sense on Native") -@DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") @OpenShiftScenario public class OpenShiftS2iQuickstartUsingUberJarIT { /** * Package type is set in the custom template. */ - // TODO: switch to main branch when Quarkus QuickStarts migrates to Quarkus 3 - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", branch = "development", contextDir = "getting-started") + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", contextDir = "getting-started") static final RestService appuberjar = new RestService(); @Test diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftTodoDemoIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftTodoDemoIT.java index 440d6f739..7767b1190 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftTodoDemoIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/OpenShiftTodoDemoIT.java @@ -4,11 +4,9 @@ import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; -import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; -// TODO: enable when Quarkus QuickStarts migrates to Quarkus 3 -@Disabled("Disabled until Quarkus QuickStarts migrates to Quarkus 3") -@DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") +// TODO: enable when Quarkus TODO app migrates to Quarkus 3 +@Disabled("Disabled until Quarkus TODO app migrates to Quarkus 3") @DisabledOnNative(reason = "Native + s2i not supported") @OpenShiftScenario public class OpenShiftTodoDemoIT extends TodoDemoIT { diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingDefaultsIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingDefaultsIT.java index b0e93c773..0e971b358 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingDefaultsIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingDefaultsIT.java @@ -7,17 +7,13 @@ import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; -import io.quarkus.test.scenarios.annotations.EnabledOnQuarkusVersion; import io.quarkus.test.services.GitRepositoryQuarkusApplication; @QuarkusScenario -// TODO: remove when Quarkus QuickStarts migrates to Quarkus 3 -@EnabledOnQuarkusVersion(version = "999-SNAPSHOT", reason = "QuickStarts on development branch uses 999-SNAPSHOT") @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support long file paths") public class QuickstartUsingDefaultsIT { - // TODO: switch to main branch when Quarkus QuickStarts migrates to Quarkus 3 - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", branch = "development", contextDir = "getting-started") + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", contextDir = "getting-started") static final RestService app = new RestService(); @Test diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java index 06ec0c585..c2d4f622c 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java @@ -8,18 +8,14 @@ import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; -import io.quarkus.test.scenarios.annotations.EnabledOnQuarkusVersion; import io.quarkus.test.services.GitRepositoryQuarkusApplication; @QuarkusScenario -// TODO: remove when Quarkus QuickStarts migrates to Quarkus 3 -@EnabledOnQuarkusVersion(version = "999-SNAPSHOT", reason = "QuickStarts on development branch use 999-SNAPSHOT") @DisabledOnNative(reason = "This is to verify uber-jar, so it does not make sense on Native") @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support long file paths") public class QuickstartUsingUsingUberJarIT { - // TODO: switch to main branch when Quarkus QuickStarts migrates to Quarkus 3 - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", branch = "development", contextDir = "getting-started", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests=true -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_PLATFORM_VERSION}") + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", contextDir = "getting-started", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests=true -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_PLATFORM_VERSION}") static final RestService app = new RestService(); @Test diff --git a/quarkus-test-openshift/src/main/resources/settings-mvn.yml b/quarkus-test-openshift/src/main/resources/settings-mvn.yml index d81c1afe1..bc1a612ff 100644 --- a/quarkus-test-openshift/src/main/resources/settings-mvn.yml +++ b/quarkus-test-openshift/src/main/resources/settings-mvn.yml @@ -33,7 +33,7 @@ data: internal.s2i.maven.remote.repository ${internal.s2i.maven.remote.repository} - false + true @@ -42,7 +42,7 @@ data: internal.s2i.maven.remote.repository ${internal.s2i.maven.remote.repository} - false + true