Port enhanced quickstarts to Glow

wildfly · Jan 4, 2024 · d423c13 · d423c13
1 parent 7687645
commit d423c13
Show file tree

Hide file tree

Showing 49 changed files with 578 additions and 1,062 deletions.
diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml
@@ -51,6 +51,7 @@ jobs:
     name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     needs: WildFly-build
+    if:
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
@@ -102,10 +102,12 @@ jobs:
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
           mvn -fae clean package -Pprovisioned-server
-          echo "Add quickstartUser..."
-          ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
-          echo "Add quickstartAdmin..."
-          ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
+          if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then 
+            echo "Add quickstartUser..."
+            ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
+            echo "Add quickstartAdmin..."
+            ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
+          fi
           echo "Starting provisioned server..."
           mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120
           echo "Testing provisioned server..."
@@ -121,11 +123,14 @@ jobs:
           echo "Building bootable jar..."
           mvn -fae clean package -Pbootable-jar
           echo "Starting bootable jar..."
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
+          # mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
+          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar &
+          # Sleep to wait for server to start (we should have a wait)
+          sleep 20
           echo "Testing bootable jar..."
           mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
           echo "Shutting down bootable jar..."          
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
         shell: bash
       - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile
         if: ${{ inputs.TEST_OPENSHIFT }}
@@ -207,10 +212,12 @@ jobs:
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
           mvn -fae clean package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
-          echo "Add quickstartUser..."
-          ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
-          echo "Add quickstartAdmin..."
-          ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
+          if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then
+            echo "Add quickstartUser..."
+            ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
+            echo "Add quickstartAdmin..."
+            ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
+          fi
           echo "Starting provisioned server..."
           mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120
           echo "Testing provisioned server..."
@@ -226,11 +233,14 @@ jobs:
           echo "Building bootable jar..."
           mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Starting bootable jar..."
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
+          #mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
+          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar &
+          # Sleep to wait for server to start (we should have a wait)
+          sleep 20
           echo "Testing bootable jar..."
           mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
-          echo "Shutting down bootable jar..."          
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown
+          echo "Shutting down bootable jar..."
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
         shell: bash
       - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile, and built Server version
         if: ${{ inputs.TEST_OPENSHIFT }}

diff --git a/.github/workflows/quickstart_todo-backend_ci.yml b/.github/workflows/quickstart_todo-backend_ci.yml
@@ -13,4 +13,4 @@ jobs:
       QUICKSTART_PATH: todo-backend
       TEST_PROVISIONED_SERVER: true
       TEST_OPENSHIFT: true
-      MATRIX_OS: "ubuntu-latest"
+      MATRIX_OS: '"ubuntu-latest"'
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -48,8 +48,7 @@
         <version.server>31.0.0.Beta1</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.pack.cloud>5.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta1</version.plugin.wildfly>
     </properties>
 
 
@@ -255,18 +254,12 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <!-- layers may be used to customize the server to provision-->
-                                <layer>batch-jberet</layer>
-                                <layer>cloud-server</layer>
-                                <layer>h2-default-datasource</layer>
-                                <layer>jsf</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <addOns>
+                                    <addOn>h2-database:default</addOn>
+                                </addOns>
+                            </discover-provisioning-info>
                             <!-- deploys the quickstart on root web context -->
                             <name>ROOT.war</name>
                         </configuration>
@@ -289,20 +282,13 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <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.pack.cloud}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>batch-jberet</layer>
-                                <layer>cloud-server</layer>
-                                <layer>h2-default-datasource</layer>
-                                <layer>jsf</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <context>cloud</context>
+                                <addOns>
+                                    <addOn>h2-database:default</addOn>
+                                </addOns>
+                            </discover-provisioning-info>
                             <filename>ROOT.war</filename>
                         </configuration>
                         <executions>

diff --git a/bmt/pom.xml b/bmt/pom.xml
@@ -48,8 +48,7 @@
         <version.server>31.0.0.Beta1</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.pack.cloud>5.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta1</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -195,18 +194,13 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cloud-server</layer>
-                                <layer>ejb</layer>
-                                <layer>jsf</layer>
-                                <layer>embedded-activemq</layer>
-                                <layer>h2-default-datasource</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <addOns>
+                                    <addOn>embedded-activemq</addOn>
+                                    <addOn>h2-database:default</addOn>
+                                </addOns>
+                            </discover-provisioning-info>
                             <name>ROOT.war</name>
                         </configuration>
                         <executions>
@@ -228,21 +222,14 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <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.pack.cloud}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cloud-server</layer>
-                                <layer>ejb</layer>
-                                <layer>jsf</layer>
-                                <layer>embedded-activemq</layer>
-                                <layer>h2-default-datasource</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <context>cloud</context>
+                                <addOns>
+                                    <addOn>embedded-activemq</addOn>
+                                    <addOn>h2-database:default</addOn>
+                                </addOns>
+                            </discover-provisioning-info>
                             <filename>ROOT.war</filename>
                         </configuration>
                         <executions>

diff --git a/cmt/pom.xml b/cmt/pom.xml
@@ -47,8 +47,7 @@
         <version.server>31.0.0.Beta1</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.pack.cloud>5.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta1</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -199,18 +198,13 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cloud-server</layer>
-                                <layer>ejb</layer>
-                                <layer>jsf</layer>
-                                <layer>embedded-activemq</layer>
-                                <layer>h2-default-datasource</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <addOns>
+                                    <addOn>embedded-activemq</addOn>
+                                    <addOn>h2-database:default</addOn>
+                                </addOns>
+                            </discover-provisioning-info>
                             <name>ROOT.war</name>
                         </configuration>
                         <executions>
@@ -232,21 +226,14 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <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.pack.cloud}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cloud-server</layer>
-                                <layer>ejb</layer>
-                                <layer>jsf</layer>
-                                <layer>embedded-activemq</layer>
-                                <layer>h2-default-datasource</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <context>cloud</context>
+                                <addOns>
+                                    <addOn>embedded-activemq</addOn>
+                                    <addOn>h2-database:default</addOn>
+                                </addOns>
+                            </discover-provisioning-info>
                             <filename>ROOT.war</filename>
                         </configuration>
                         <executions>

diff --git a/ee-security/pom.xml b/ee-security/pom.xml
@@ -48,8 +48,7 @@
         <version.server>31.0.0.Beta1</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.pack.cloud>5.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta1</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -179,15 +178,9 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <feature-packs>
-                                <feature-pack>                                    
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <!-- layers may be used to customize the server to provision -->
-                                <layer>cloud-server</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                            </discover-provisioning-info>
                             <!-- deploys the quickstart on root web context -->
                             <name>ROOT.war</name>
                             <packaging-scripts>
@@ -219,17 +212,10 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <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.pack.cloud}</location>
-                                </feature-pack>
-                            </feature-packs>
-                            <layers>
-                                <layer>cloud-server</layer>
-                            </layers>
+                            <discover-provisioning-info>
+                                <version>${version.server}</version>
+                                <context>cloud</context>
+                            </discover-provisioning-info>
                             <filename>ROOT.war</filename>
                             <packaging-scripts>
                                 <packaging-script>