Merge pull request #768 from michalvavrik/feature/enable-oc-qs-tests-…

…on-snapshot Refactor external apps with Quarkus snapshot
quarkus-qe · May 11, 2023 · 07b8222 · 07b8222
2 parents fc1b6f3 + 3477c46
commit 07b8222
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 33 deletions.
diff --git a/...s/external-applications/src/test/java/io/quarkus/qe/DevModeQuickstartUsingDefaultsIT.java b/...s/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/...ions/src/test/java/io/quarkus/qe/OpenShiftContainerRegistryQuickstartUsingDefaultsIT.java b/...ions/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/...ftExtensionQuickstartUsingDefaultsIT.java → ...penShiftExtensionCamelFileBindyFtpIT.java b/...ftExtensionQuickstartUsingDefaultsIT.java → ...penShiftExtensionCamelFileBindyFtpIT.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/...ildStrategyQuickstartUsingDefaultsIT.java → ...ckerBuildStrategyCamelFileBindyFtpIT.java b/...ildStrategyQuickstartUsingDefaultsIT.java → ...ckerBuildStrategyCamelFileBindyFtpIT.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/...ernal-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingDefaultsIT.java b/...ernal-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/...ternal-applications/src/test/java/io/quarkus/qe/OpenShiftS2iQuickstartUsingUberJarIT.java b/...ternal-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
@@ -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
@@ -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/...ples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java b/...ples/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
@@ -33,7 +33,7 @@ data:
                         <id>internal.s2i.maven.remote.repository</id>
                         <url>${internal.s2i.maven.remote.repository}</url>
                         <snapshots>
-                            <enabled>false</enabled>
+                            <enabled>true</enabled>
                         </snapshots>
                     </repository>
                 </repositories>
@@ -42,7 +42,7 @@ data:
                         <id>internal.s2i.maven.remote.repository</id>
                         <url>${internal.s2i.maven.remote.repository}</url>
                         <snapshots>
-                            <enabled>false</enabled>
+                            <enabled>true</enabled>
                         </snapshots>
                     </pluginRepository>
                 </pluginRepositories>