chore: Cherry-pick of caching service stability test to v2

.github/workflows/infinispan-jgroup-stability-test.yml

@@ -0,0 +1,43 @@
+name: Stability Test for Infinispan JGroups
+
+on:
+    pull_request:
+        branches: [ v2.x.x ]
+        paths-ignore:
+            - '**.md'
+    workflow_dispatch:
+
+env:
+    JOB_ID: ${{ github.run_id }}-${{ github.run_number }}
+
+jobs:
+    InfinispanJGroupStabilityTest:
+        runs-on: ubuntu-latest
+        timeout-minutes: 25
+
+        steps:
+            -   uses: actions/checkout@v4
+                with:
+                    ref: ${{ github.head_ref }}
+
+            -   uses: ./.github/actions/setup
+
+            -   name: Build with Gradle
+                run: >
+                    ./gradlew clean build -x test -x npmTest -x npmInstall -x npmBuild
+
+            -   name: Run Infinispan JGroup Stability Tests
+                run: >
+                    ./gradlew :integration-tests:runInfinispanJGroupStabilityTest --info
+                    -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
+
+            -   name: Store results
+                uses: actions/upload-artifact@v4
+                if: always()
+                with:
+                    name: InfinispanJGroupStabilityTests-${{ env.JOB_ID }}
+                    path: |
+                        */build/reports/**
+                        results/**
+
+            -   uses: ./.github/actions/teardown

build.gradle

@@ -245,6 +245,10 @@ task runCachingServiceTests(dependsOn: ":integration-tests:runCachingServiceTest
     description "Run caching service tests"
     group "Integration tests"
 }
+task runInfinispanJGroupStabilityTest(dependsOn: ":integration-tests:runInfinispanJGroupStabilityTest") {
+    description "Run JGroup stability tests for caching service with infinispan storage option"
+    group "Integration tests"
+}
 task runInfinispanServiceTests(dependsOn: ":integration-tests:runInfinispanServiceTests") {
     description "Run tests for caching service with infinispan storage option"
     group "Integration tests"

caching-service/src/main/java/org/zowe/apiml/caching/health/InfinispanHealthIndicator.java

@@ -65,7 +65,7 @@ protected void doHealthCheck(Health.Builder builder) {
         String[] initialHostsArray = StringUtils.split(initialHosts, ",");
         boolean allMembers = initialHostsArray.length <= cm.getMembers().size();
         Map<String, Object> cluster = new HashMap<>();
-        cluster.put("status", allMembers ? Status.UP : Status.DOWN);
+        cluster.put("status", allMembers ? Status.UP.getCode() : Status.DOWN.getCode());
         cluster.put("address", cm.getAddress().toString());
         cluster.put("initialHosts", initialHostsArray);
         cluster.put("members", cm.getMembers().stream().map(Address::toString).collect(Collectors.toList()));

integration-tests/build.gradle

@@ -127,7 +127,8 @@ task runLocalIntegrationTests(type: Test) {
             'HATest',
             'ChaoticHATest',
             'OidcOauth2Test',
-            'MultipleRegistrationsTest'
+            'MultipleRegistrationsTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
     outputs.upToDateWhen { false }
@@ -151,7 +152,8 @@ task runAllIntegrationTestsNormal(type: Test) {
             'NotAttlsTest',
             'OidcOauth2Test',
             'MultipleRegistrationsTest',
-            'HealthEndpointProtectionDisabledTest'
+            'HealthEndpointProtectionDisabledTest',
+            'InfinispanJGroupStabilityTest'
         )
 
     }
@@ -208,7 +210,8 @@ task runAllIntegrationTestsForZoweNonHaTestingOnZos(type: Test) {
             'CloudGatewayProxyTest',
             'CloudGatewayAuthTest',
             'CloudGatewayCentralRegistry',
-            'SafIdTokenTest'
+            'SafIdTokenTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 
@@ -253,7 +256,8 @@ task runAllIntegrationTestsForZoweHaTestingOnZos(type: Test) {
             'CloudGatewayCentralRegistry',
             'SafIdTokenTest',
             'ChaoticHATest',
-            'GraphQLTest'
+            'GraphQLTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 
@@ -285,7 +289,8 @@ task runAllIntegrationTestsForZoweTesting(type: Test) {
             'ChaoticHATest',
             'OidcOauth2Test',
             'MultipleRegistrationsTest',
-            'NotForMainframeTest'
+            'NotForMainframeTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
     outputs.upToDateWhen { false }
@@ -313,7 +318,8 @@ task runCITests(type: Test) {
             'ChaoticHATest',
             'OidcOauth2Test',
             'MultipleRegistrationsTest',
-            'HealthEndpointProtectionDisabledTest'
+            'HealthEndpointProtectionDisabledTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 }
@@ -347,7 +353,8 @@ task runContainerTests(type: Test) {
             'CloudGatewayServiceRouting',
             'CloudGatewayCentralRegistry',
             'ZaasTest',
-            'HealthEndpointProtectionDisabledTest'
+            'HealthEndpointProtectionDisabledTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 }
@@ -384,7 +391,8 @@ task runBaseTests(type: Test) {
             'CloudGatewayServiceRouting',
             'CloudGatewayCentralRegistry',
             'MultipleRegistrationsTest',
-            'HealthEndpointProtectionDisabledTest'
+            'HealthEndpointProtectionDisabledTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 }
@@ -485,7 +493,8 @@ task runZosmfAuthTest(type: Test) {
             'zOSMFAuthTest'
         )
         excludeTags(
-            'InfinispanStorageTest'
+            'InfinispanStorageTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 }
@@ -517,7 +526,8 @@ task runCachingServiceTests(type: Test) {
             'CachingServiceTest'
         )
         excludeTags(
-            'InfinispanStorageTest'
+            'InfinispanStorageTest',
+            'InfinispanJGroupStabilityTest'
         )
     }
 }
@@ -537,6 +547,20 @@ task runInfinispanServiceTests(type: Test) {
     }
 }
 
+task runInfinispanJGroupStabilityTest(type: Test) {
+    group "integration tests"
+    description "Run Caching service with infinispan storage for testing JGroup stability"
+
+    outputs.cacheIf { false }
+
+    systemProperties System.getProperties()
+    useJUnitPlatform {
+        includeTags(
+            'InfinispanJGroupStabilityTest'
+        )
+    }
+}
+
 task runBaseTestsInternalPort(type: Test) {
     group "Integration tests"
     description "Run only tests without long tests"