diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f5797de1..fb1789e9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -39,7 +39,8 @@ jobs: - name: Checkout ci.common uses: actions/checkout@v3 with: - repository: OpenLiberty/ci.common + repository: cherylking/ci.common + ref: changeMinVersionForVersionlessFeatures path: ci.common - name: Checkout ci.ant uses: actions/checkout@v3 @@ -124,7 +125,7 @@ jobs: - name: Clone ci.ant, ci.common, ci.gradle repos to C drive run: | cp -r D:/a/ci.gradle/ci.gradle C:/ci.gradle - git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common + git clone https://github.com/cherylking/ci.common.git --branch changeMinVersionForVersionlessFeatures --single-branch C:/ci.common git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant # Cache mvn/gradle packages - name: Cache Maven packages diff --git a/src/test/groovy/io/openliberty/tools/gradle/KernelInstallVersionlessFeatureTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/KernelInstallVersionlessFeatureTest.groovy index b73cffdd..f1bfc09e 100644 --- a/src/test/groovy/io/openliberty/tools/gradle/KernelInstallVersionlessFeatureTest.groovy +++ b/src/test/groovy/io/openliberty/tools/gradle/KernelInstallVersionlessFeatureTest.groovy @@ -130,10 +130,9 @@ class KernelInstallVersionlessFeatureTest extends AbstractIntegrationTest{ assertTrue(output.contains(messageOL) || output.contains(messageWL)) } - //@Test - // Commented out because current failure returns - // "Cannot invoke "com.ibm.ws.kernel.feature.provisioning.ProvisioningFeatureDefinition.getSymbolicName()" because the return value of "java.util.HashMap.get(Object)" is null" - // Opened issue https://github.com/OpenLiberty/ci.common/issues/452 to follow up. + @Test + // This test required a fix that is in 24.0.0.10. + // Opened issue https://github.com/OpenLiberty/ci.common/issues/452 for it. /** * Install with only server.xml features */