diff --git a/.github/workflows/legacy-build.yml b/.github/workflows/legacy-build.yml index 28f79f25..3e09e31a 100644 --- a/.github/workflows/legacy-build.yml +++ b/.github/workflows/legacy-build.yml @@ -38,7 +38,7 @@ jobs: cache: 'maven' distribution: 'temurin' - name: Build and Test on ${{ matrix.java }} - ${{ matrix.wildfly-version }} - run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}' + run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}' '-Dskip.channel.tests' - name: Upload surefire logs for failed run uses: actions/upload-artifact@v4 if: failure() diff --git a/tests/shared/src/main/java/org/wildfly/plugin/categories/ChannelsRequired.java b/tests/shared/src/main/java/org/wildfly/plugin/categories/ChannelsRequired.java new file mode 100644 index 00000000..2d67a037 --- /dev/null +++ b/tests/shared/src/main/java/org/wildfly/plugin/categories/ChannelsRequired.java @@ -0,0 +1,12 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.wildfly.plugin.categories; + +/** + * @author James R. Perkins + */ +public interface ChannelsRequired { +} diff --git a/tests/standalone-tests/pom.xml b/tests/standalone-tests/pom.xml index 573dd6dd..2d8a1d7b 100644 --- a/tests/standalone-tests/pom.xml +++ b/tests/standalone-tests/pom.xml @@ -124,4 +124,25 @@ + + + + skip-channel-tests + + + skip.channel.tests + + + + + + maven-surefire-plugin + + org.wildfly.plugin.categories.ChannelsRequired + + + + + + diff --git a/tests/standalone-tests/src/test/java/org/wildfly/plugin/provision/PackageTest.java b/tests/standalone-tests/src/test/java/org/wildfly/plugin/provision/PackageTest.java index 8bc3ca89..4912068a 100644 --- a/tests/standalone-tests/src/test/java/org/wildfly/plugin/provision/PackageTest.java +++ b/tests/standalone-tests/src/test/java/org/wildfly/plugin/provision/PackageTest.java @@ -11,6 +11,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.wildfly.plugin.categories.ChannelsRequired; import org.wildfly.plugin.tests.AbstractProvisionConfiguredMojoTestCase; import org.wildfly.plugin.tests.AbstractWildFlyMojoTest; @@ -36,6 +38,7 @@ public void testPackage() throws Exception { } @Test + @Category(ChannelsRequired.class) public void testPackageWithChannel() throws Exception { final Mojo packageMojo = lookupConfiguredMojo(AbstractWildFlyMojoTest.getPomFile("package-channel-pom.xml").toFile(), diff --git a/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml index db094fb9..2ac2cfb1 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml @@ -21,12 +21,13 @@ org.wildfly.channels wildfly + WF_VERSION - org.wildfly:wildfly-galleon-pack + org.wildfly:wildfly-galleon-pack:WF_VERSION