[WFLY-18502]: remote-helloworld-mdb Quickstart Common Enhancements CY…

…2023Q3 Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
wildfly · Oct 6, 2023 · d90ea7b · d90ea7b
1 parent 036830b
commit d90ea7b
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 213 deletions.
diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
@@ -43,7 +43,7 @@ jobs:
           mvn -U -B -fae clean install -Drelease
         shell: bash
       - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile
-        if: ${{ !inputs.MICROPROFILE }}
+        if: ${{ !fromJSON(inputs.MICROPROFILE) }}
         run: |
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
@@ -57,7 +57,7 @@ jobs:
           mvn -U -B -fae wildfly:shutdown
         shell: bash
       - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile
-        if: ${{ inputs.MICROPROFILE }}
+        if: ${{ fromJSON(inputs.MICROPROFILE) }}
         run: |
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}

diff --git a/.github/workflows/quickstart_remote-helloworld-mdb_ci.yml b/.github/workflows/quickstart_remote-helloworld-mdb_ci.yml
@@ -0,0 +1,27 @@
+name: WildFly remote-helloworld-mdb Quickstart CI
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - 'remote-helloworld-mdb/**'
+      - '.github/workflows/quickstart_ci.yml'
+jobs:
+  container-job:
+    # Service containers to run with `container-job`
+    services:
+      # Label used to access the service container
+      artemis:
+        # Docker Hub image
+        image: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:latest
+        # Provide the password for postgres
+        env:
+          AMQ_USER: admin
+          AMQ_PASSWORD: admin
+        ports:
+          - 61616:61616
+  call-quickstart_ci:
+    uses: ./.github/workflows/quickstart_ci.yml
+    with:
+      QUICKSTART_PATH: remote-helloworld-mdb
+      MICROPROFILE: false
diff --git a/remote-helloworld-mdb/README.adoc b/remote-helloworld-mdb/README.adoc
@@ -55,12 +55,6 @@ $ docker run --rm --name artemis -e AMQ_USER=admin -e AMQ_PASSWORD=admin -p8161:
 
 You can access the console of {BrokerProductName} at the URL: http://localhost:8161/console with *admin/admin* to authenticate.
 
-// Back Up the {productName} Standalone Server Configuration
-include::../shared-doc/back-up-server-standalone-configuration.adoc[leveloffset=+2]
-
-// Start the {productName} Standalone Server
-include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+2]
-
 [[configure_the_server]]
 === Configure the {productName} Server
 
@@ -103,8 +97,8 @@ The following `testQueue` jms-queue was configured in the configuration of the `
 <pooled-connection-factory name="RemoteConnectionFactory" entries="java:jboss/RemoteConnectionFactory java:jboss/exported/jms/RemoteConnectionFactory" connectors="artemis" user="admin" password="admin" enable-amq1-prefix="false"/>
 ----
 
-
-
+// Start the {productName} Standalone Server
+include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+2]
 // Build and Deploy the Quickstart
 include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2]
 
@@ -125,12 +119,8 @@ INFO  [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-5 (ActiveM
 INFO  [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-4 (ActiveMQ-client-global-threads-1189700957)) Received Message from queue: This is message 5
 ----
 
-// Testing with Arquillian
-include::../shared-doc/run-arquillian-integration-tests-with-server-distribution.adoc[leveloffset=+2]
-// Undeploy the Quickstart
-include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
-// Restore the {productName} Standalone Server Configuration
-include::../shared-doc/restore-standalone-server-configuration.adoc[leveloffset=+2]
+// Server Distribution Testing
+include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2]
 
 // Additional information about this script
 This script removes the remote broker connection from the `messaging-activemq` subsystem and restore the `default` internal broker. You should see the following result when you run the script:
@@ -147,18 +137,19 @@ This script removes the remote broker connection from the `messaging-activemq` s
 // Restore the {productName} Standalone Server Configuration Manually
 include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+3]
 
-// Build and run sections for other environments/builds
-ifndef::ProductRelease,EAPXPRelease[]
-include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
+include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
+
 [NOTE]
 ====
-The Arquillian integration tests expect a running {BrokerProductName} broker, so make sure you have started the broker before you begin.
+The integration tests expect a running {BrokerProductName} broker, so make sure you have started the broker before you begin.
 ====
+// Build and run sections for other environments/builds
+ifndef::ProductRelease,EAPXPRelease[]
+include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
 
 endif::[]
 
-== Building and running the quickstart application with OpenShift
-
+include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
 === Deploy a {BrokerProductName} instance on OpenShift
 
 [source,options="nowrap",subs="+attributes"]
@@ -169,12 +160,7 @@ $ oc run artemis --env AMQ_USER=admin --env AMQ_PASSWORD=admin --image={BrokerIm
 This will create a broker instance named `artemis` on OpenShift that can be accessed on the port `61616` on the service `artemis` with the account *admin/admin*.
 //Prepare Helm for Quickstart Deployment
 
-// Getting Started with Helm
-include::../shared-doc/helm-getting-started-overview.adoc[leveloffset=+2]
-//Prepare Helm for Quickstart Deployment
-include::../shared-doc/helm-deploy-project.adoc[leveloffset=+2]
-// Testing on Openshift
-include::../shared-doc/run-arquillian-integration-tests-with-openshift.adoc[leveloffset=+2]
+include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
 
 ==== Clean Up
 

diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml
@@ -44,11 +44,13 @@
     </licenses>
 
     <properties>
-        <!-- The versions for BOMs, Dependencies and Plugins -->
-        <version.server.bom>30.0.0.Beta1</version.server.bom>
+        <!-- the version for the Server -->
         <version.server>30.0.0.Beta1</version.server>
-        <version.wildfly.maven.plugin>4.2.0.Final</version.wildfly.maven.plugin>
-        <version.cloud.fp>5.0.0.Beta1</version.cloud.fp>
+        <!-- The versions for BOMs, Packs and Plugins -->
+        <version.bom.ee>${version.server}</version.bom.ee>      
+        <version.pack.cloud>5.0.0.Beta1</version.pack.cloud>
+        <version.plugin.wildfly>4.2.0.Final</version.plugin.wildfly>
+        <version.junit-jupiter-engine>5.10.0</version.junit-jupiter-engine>
     </properties>
 
     <repositories>
@@ -112,10 +114,15 @@
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
-                <version>${version.server.bom}</version>
+                <version>${version.server}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${version.junit-jupiter-engine}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -150,50 +157,20 @@
 
         <!-- Tests -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-test-spi</artifactId>
-            <scope>test</scope>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.junit</groupId>
-            <artifactId>arquillian-junit-container</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.arquillian</groupId>
-            <artifactId>wildfly-arquillian-common</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <profiles>
         <profile>
             <id>provisioned-server</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.wildfly.arquillian</groupId>
-                    <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
-                        <version>${version.wildfly.maven.plugin}</version>
                         <configuration>
                             <feature-packs>
                                 <feature-pack>
@@ -216,30 +193,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${version.failsafe.plugin}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <environmentVariables>
-                                        <JBOSS_HOME>${project.build.directory}/server</JBOSS_HOME>
-                                    </environmentVariables>
-                                    <includes>
-                                        <include>**/ProvisionedManagedMDBServletIT</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>**/RemoteMDBServletIT</exclude>
-                                    </excludes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -250,14 +203,13 @@
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
-                        <version>${version.wildfly.maven.plugin}</version>
                         <configuration>
                             <feature-packs>
                                 <feature-pack>
                                     <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
                                 </feature-pack>
                                 <feature-pack>
-                                    <location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.cloud.fp}</location>
+                                    <location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
                                 </feature-pack>
                             </feature-packs>
                             <layers>
@@ -279,16 +231,7 @@
             </build>
         </profile>
         <profile>
-            <!-- An optional Arquillian testing profile that executes tests in a remote JBoss EAP instance.
-            Run with: mvn clean verify -Parq-remote -->
-            <id>arq-remote</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.wildfly.arquillian</groupId>
-                    <artifactId>wildfly-arquillian-container-remote</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
+            <id>integration-testing</id>
             <build>
                 <plugins>
                     <plugin>
@@ -305,11 +248,8 @@
                         </executions>
                         <configuration>
                             <includes>
-                                <include>**/RemoteMDBServletIT</include>
+                                <include>**/BasicRuntimeIT</include>
                             </includes>
-                            <excludes>
-                                <exclude>**/ProvisionedManagedMDBServletIT</exclude>
-                            </excludes>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/...quickstarts/mdb/AbstractMDBServletIT.java → ...ss/as/quickstarts/mdb/BasicRuntimeIT.java b/...quickstarts/mdb/AbstractMDBServletIT.java → ...ss/as/quickstarts/mdb/BasicRuntimeIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 JBoss by Red Hat.
+ * Copyright 2022 JBoss by Red Hat.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,26 @@
  */
 package org.jboss.as.quickstarts.mdb;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  * @author Emmanuel Hugonnet (c) 2023 Red Hat, Inc.
  */
-public abstract class AbstractMDBServletIT {
+public class BasicRuntimeIT {
 
-    protected abstract URI getHTTPEndpoint();
+    private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/remote-helloworld-mdb";
 
     @Test
     public void testSendToQueue() throws IOException, InterruptedException {
@@ -94,4 +95,20 @@ public void testSendToTopic() throws IOException, InterruptedException {
     protected String getLineSeparator() {
         return "\n";
     }
+
+    private String getServerHost() {
+        String host = System.getenv("SERVER_HOST");
+        if (host == null) {
+            host = System.getProperty("server.host", DEFAULT_SERVER_HOST);
+        }
+        return host;
+    }
+
+    protected URI getHTTPEndpoint() {
+        try {
+            return new URI(getServerHost() + "/HelloWorldMDBServletClient");
+        } catch (URISyntaxException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
 }