Merge pull request Intersmash#42 from fabiobrz/enable-wildfly-image-p…

…rovisioner-test [issue 21] - Enabling WildflyImageProvisionerTest
tommaso-borgato · May 5, 2023 · c8c99b8 · c8c99b8
2 parents 1f485b4 + 7dcd092
commit c8c99b8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/global-test.properties b/global-test.properties
@@ -9,16 +9,20 @@ xtf.record.always=false
 # Avoid starting multiple builds at once as it might cause that builds starts to hang
 xtf.junit.prebuilder.synchronized=true
 
-# Bootable jar
+# Bootable JAR OpenJDK base image
 intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17
 
-# WildFly community operator settings
+# WildFly operator settings
 intersmash.wildfly.operators.catalog_source=community-operators-wildfly-operator
 intersmash.wildfly.operators.index_image=quay.io/operatorhubio/catalog:latest
 intersmash.wildfly.operators.package_manifest=wildfly
 intersmash.wildfly.operators.channel=alpha
 
-# Kafka community operator settings
+# Wildfly images
+intersmash.wildfly.image=quay.io/wildfly/wildfly-s2i-jdk17
+intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime-jdk17
+
+# Kafka operator settings
 intersmash.kafka.operators.channel=strimzi-0.29.x
 
 # DB

diff --git a/...ision/openshift/WildflyImageTestCase.java → ...hift/WildflyImageProvisionerTestCase.java b/...ision/openshift/WildflyImageTestCase.java → ...hift/WildflyImageProvisionerTestCase.java
@@ -27,7 +27,6 @@
 import org.jboss.intersmash.tools.provision.openshift.WildflyImageOpenShiftProvisioner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import cz.xtf.core.openshift.OpenShift;
@@ -40,14 +39,13 @@
 
 /**
  * This test verifies a binary build can be executed using a remote git repository containing a maven project using the
- * wildfly-maven-plugin;
+ * wildfly-maven-plugin.
  * <br>
- * The code inside the remote git repository is uploaded to the builder image and the actual maven build is executed
- * inside the builder image with a command like the following:
+ * The code inside the remote git repository is pulled by the running Pod and the actual Maven build is executed
+ * inside the builder image.
  */
 @CleanBeforeAll
-@Disabled("Until we have a reliable way to provide snapshot artifacts to the Pods running s2i v2")
-public class WildflyImageTestCase {
+public class WildflyImageProvisionerTestCase {
 	private static final OpenShift openShift = OpenShifts.master();
 	private static final WildflyImageOpenShiftApplication application = OpenShiftProvisionerTestBase
 			.getWildflyOpenShiftImageApplication();

diff --git a/tools/intersmash-tools-provisioners/pom.xml b/tools/intersmash-tools-provisioners/pom.xml
@@ -145,6 +145,16 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources/filtered</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
         <plugins>
             <!--
                 We want for tests to be executed by Surefire, but we also add an XTF system property to the inherited

diff --git a/...h-tools-provisioners/src/main/resources/filtered/intersmash-tools-provisioners.properties b/...h-tools-provisioners/src/main/resources/filtered/intersmash-tools-provisioners.properties
@@ -0,0 +1 @@
+deploymentsBuildProfile=${intersmash.deployments.build.profile}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		deploymentsBuildProfile=${intersmash.deployments.build.profile}