From 4c3ac36314041a5c406292ba7f5c2ff3729dae61 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Thu, 26 Sep 2024 13:33:09 -0500
Subject: [PATCH 1/2] [WFLY-19273] Disable manualmode-expansion testing when
 configured to only test wildfly-ee

---
 .../integration/manualmode-expansion/pom.xml  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/testsuite/integration/manualmode-expansion/pom.xml b/testsuite/integration/manualmode-expansion/pom.xml
index 11d5fbf0dba1..d6adb8e5122b 100644
--- 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>

From 336ebbcf6dd609f42453817f8069d3db3cdba344 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Thu, 26 Sep 2024 13:56:17 -0500
Subject: [PATCH 2/2] [WFLY-19273] Add missing expansion extensions to
 HostExcludesTestCase

---
 .../as/test/integration/domain/HostExcludesTestCase.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/HostExcludesTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/HostExcludesTestCase.java
index 3cb30dddfcd6..a6151e85646b 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/HostExcludesTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/HostExcludesTestCase.java
@@ -236,7 +236,7 @@ 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",
@@ -244,11 +244,14 @@ private static List<String> getCurrentRemovedExtensions() {
                 "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;
         }