Merge pull request #26 from jfdenise/release

grpc 0.1.3.Final, provision server during tests.
wildfly · Jan 26, 2024 · 9c0f3b0 · 9c0f3b0
2 parents 5813a7a + 3725683
commit 9c0f3b0
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
 
 env:
-  WILDFLY_GLOW: https://github.com/wildfly/wildfly-glow/releases/download/1.0.0.Alpha11/wildfly-glow-1.0.0.Alpha11.zip
+  WILDFLY_GLOW: https://github.com/wildfly/wildfly-glow/releases/download/1.0.0.Beta7/wildfly-glow-1.0.0.Beta7.zip
 jobs:
   build:
     name: ${{ matrix.os }}-jdk${{ matrix.java }}

diff --git a/31.0.0.Final/provisioning-bare-metal.xml b/31.0.0.Final/provisioning-bare-metal.xml
@@ -4,7 +4,7 @@
     <feature-pack location="org.wildfly:wildfly-galleon-pack:31.0.0.Final"/>
     <feature-pack location="org.wildfly:wildfly-datasources-galleon-pack:7.0.0.Final"/>
     <feature-pack location="org.keycloak:keycloak-saml-adapter-galleon-pack:23.0.0"/>
-    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-feature-pack:0.1.2.Final"/>
+    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-feature-pack:0.1.3.Final"/>
     <feature-pack location="org.wildfly:wildfly-myfaces-feature-pack:2.0.0.Final"/>
     <feature-pack location="org.wildfly.extras.graphql:wildfly-microprofile-graphql-feature-pack:2.2.0.Final"/>
     <feature-pack location="org.jboss.resteasy.spring:galleon-feature-pack:3.1.1.Beta1"/>

diff --git a/31.0.0.Final/provisioning-cloud.xml b/31.0.0.Final/provisioning-cloud.xml
@@ -5,7 +5,7 @@
     <feature-pack location="org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final"/>
     <feature-pack location="org.wildfly:wildfly-datasources-galleon-pack:7.0.0.Final"/>
     <feature-pack location="org.keycloak:keycloak-saml-adapter-galleon-pack:23.0.0"/>
-    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-feature-pack:0.1.2.Final"/>
+    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-feature-pack:0.1.3.Final"/>
     <feature-pack location="org.wildfly:wildfly-myfaces-feature-pack:2.0.0.Final"/>
     <feature-pack location="org.wildfly.extras.graphql:wildfly-microprofile-graphql-feature-pack:2.2.0.Final"/>
     <feature-pack location="org.jboss.resteasy.spring:galleon-feature-pack:3.1.1.Beta1"/>

diff --git a/31.0.0.Final/tech-preview/provisioning-bare-metal.xml b/31.0.0.Final/tech-preview/provisioning-bare-metal.xml
@@ -3,6 +3,6 @@
 <installation xmlns="urn:jboss:galleon:provisioning:3.0">
     <feature-pack location="org.wildfly:wildfly-preview-feature-pack:31.0.0.Final"/>
     <feature-pack location="org.wildfly:wildfly-datasources-preview-galleon-pack:7.0.0.Final"/>
-    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-preview-feature-pack:0.1.2.Final"/>
+    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-preview-feature-pack:0.1.3.Final"/>
     <feature-pack location="org.jboss.resteasy.spring:galleon-preview-feature-pack:3.1.1.Beta1"/>
 </installation>
diff --git a/31.0.0.Final/tech-preview/provisioning-cloud.xml b/31.0.0.Final/tech-preview/provisioning-cloud.xml
@@ -4,6 +4,6 @@
     <feature-pack location="org.wildfly:wildfly-preview-feature-pack:31.0.0.Final"/>
     <feature-pack location="org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:6.0.0.Final"/>
     <feature-pack location="org.wildfly:wildfly-datasources-preview-galleon-pack:7.0.0.Final"/>
-    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-preview-feature-pack:0.1.2.Final"/>
+    <feature-pack location="org.wildfly.extras.grpc:wildfly-grpc-preview-feature-pack:0.1.3.Final"/>
     <feature-pack location="org.jboss.resteasy.spring:galleon-preview-feature-pack:3.1.1.Beta1"/>
 </installation>
diff --git a/tests/run-wildfly-glow-tests.sh b/tests/run-wildfly-glow-tests.sh
@@ -58,6 +58,34 @@ else
     echo "ERROR $warFile, found layers $found_layers; expected $expected"
     test_failure=1
   fi
+  # Check provisioning
+  echo "Testing SERVER provisioning"
+  java $JAVA_OPTS $compact  -jar $jar scan \
+  $warFile \
+  ${provisioningFile} \
+  $profile \
+  $addOns \
+  $context \
+  $preview --provision=SERVER
+  if [ $? -ne 0 ]; then
+    echo "ERROR SERVER provisioning $warFile"
+    test_failure=1
+  fi
+
+  if [ -z "$context" ]; then
+  echo "\nTesting BOOTABLE_JAR provisioning"
+  java $JAVA_OPTS $compact  -jar $jar scan \
+  $warFile \
+  ${provisioningFile} \
+  $profile \
+  $addOns \
+  $context \
+  $preview --provision=BOOTABLE_JAR
+  if [ $? -ne 0 ]; then
+    echo "ERROR BOOTABLE_JAR provisioning $warFile"
+    test_failure=1
+  fi
+  fi
 fi
 }