Merge pull request wildfly#18248 from bstansberry/WFLY-19273

[WFLY-19273] Fix failures in "Standard - Alt Dist - Linux - JDK 11" nightly job
ropalka · Oct 3, 2024 · 2badace · 2badace
2 parents f7a5799 + 336ebbc
commit 2badace
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/...suite/domain/src/test/java/org/jboss/as/test/integration/domain/HostExcludesTestCase.java b/...suite/domain/src/test/java/org/jboss/as/test/integration/domain/HostExcludesTestCase.java
@@ -236,19 +236,22 @@ private static List<String> getCurrentRemovedExtensions() {
         private final boolean supported;
 
         // List of extensions added by the wildfly-galleon-pack
-        private final Set<String> mpExtensions = new HashSet<>(Arrays.asList(
+        private final Set<String> expansionExtensions = new HashSet<>(Arrays.asList(
                 "org.wildfly.extension.micrometer",
                 "org.wildfly.extension.microprofile.config-smallrye",
                 "org.wildfly.extension.microprofile.health-smallrye",
                 "org.wildfly.extension.microprofile.metrics-smallrye",
                 "org.wildfly.extension.microprofile.fault-tolerance-smallrye",
                 "org.wildfly.extension.microprofile.jwt-smallrye",
                 "org.wildfly.extension.microprofile.openapi-smallrye",
+                "org.wildfly.extension.microprofile.opentracing-smallrye",
                 "org.wildfly.extension.microprofile.reactive-messaging-smallrye",
                 "org.wildfly.extension.microprofile.reactive-streams-operators-smallrye",
                 "org.wildfly.extension.microprofile.lra-coordinator",
                 "org.wildfly.extension.microprofile.lra-participant",
-                "org.wildfly.extension.microprofile.telemetry"
+                "org.wildfly.extension.microprofile.telemetry",
+                "org.wildfly.extension.mvc-krazo",
+                "org.wildfly.extension.opentelemetry"
         ));
 
         // List of extensions added only by WildFly Preview.
@@ -316,7 +319,7 @@ public Set<String> getExtensions(boolean isFullDistribution, boolean isPreview)
                 this.extensions.addAll(previewExtensions);
             }
             if (!isFullDistribution && !isPreview) {
-                return diff.apply(extensions, mpExtensions);
+                return diff.apply(extensions, expansionExtensions);
             }
             return extensions;
         }

diff --git a/testsuite/integration/manualmode-expansion/pom.xml b/testsuite/integration/manualmode-expansion/pom.xml
@@ -373,6 +373,12 @@
                         <standard.dist.version>${project.version}</standard.dist.version>
                     </systemPropertyVariables>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase>${surefire.default-test.phase}</phase>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -467,5 +473,35 @@
                 <channel.provisioning.phase>none</channel.provisioning.phase>
             </properties>
         </profile>
+        <profile>
+            <id>ignore-ee-feature-pack</id>
+            <activation>
+                <property>
+                    <name>testsuite.ee.galleon.pack.artifactId</name>
+                    <value>wildfly-ee-galleon-pack</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- Don't run expansion tests if we're configured to test wildfly-ee -->
+                <surefire.default-test.phase>none</surefire.default-test.phase>
+                <!-- No point provisioning as we won't test -->
+                <channel.provisioning.phase>none</channel.provisioning.phase>
+            </properties>
+        </profile>
+        <profile>
+            <id>ignore-ee-alt-dist</id>
+            <activation>
+                <property>
+                    <name>testsuite.default.build.project.prefix</name>
+                    <value>ee-</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- Don't run expansion tests if we're configured to test wildfly-ee -->
+                <surefire.default-test.phase>none</surefire.default-test.phase>
+                <!-- No point provisioning as we won't test -->
+                <channel.provisioning.phase>none</channel.provisioning.phase>
+            </properties>
+        </profile>
     </profiles>
 </project>