fix: enable redis storage mode in tests (#2522)

* enable redis storage

Signed-off-by: achmelo <a.chmelo@gmail.com>

* run redis test only, use service name as host

Signed-off-by: achmelo <a.chmelo@gmail.com>

* remove publish results

Signed-off-by: achmelo <a.chmelo@gmail.com>

* do not expect sentinel setup in caching service

Signed-off-by: achmelo <a.chmelo@gmail.com>

* test redis only without tls

Signed-off-by: achmelo <a.chmelo@gmail.com>

* depends on correct job

Signed-off-by: achmelo <a.chmelo@gmail.com>

* typo

Signed-off-by: achmelo <a.chmelo@gmail.com>

* jobname

Signed-off-by: achmelo <a.chmelo@gmail.com>

Author: achmelo

.github/workflows/containers.yml

@@ -373,70 +373,6 @@ jobs:
 
             -   uses: ./.github/actions/teardown
 
-    CITestsWithRedis:
-        needs: PublishJibContainers
-        runs-on: ubuntu-latest
-        container: ubuntu:latest
-        timeout-minutes: 15
-
-        services:
-            api-catalog-services:
-                image: ghcr.io/balhar-jakub/api-catalog-services:${{ github.event.pull_request.number || 'latest' }}
-                volumes:
-                    - /api-defs:/api-defs
-            caching-service:
-                image: ghcr.io/balhar-jakub/caching-service:${{ github.event.pull_request.number || 'latest' }}
-                env:
-                    ZWE_CACHING_SERVICE_PERSISTENT: 'redis'
-                    CACHING_STORAGE_REDIS_MASTERNODEURI: 'default:heslo@localhost:6379'
-                    CACHING_STORAGE_REDIS_SSL_ENABLED: true
-            discoverable-client:
-                image: ghcr.io/balhar-jakub/discoverable-client:${{ github.event.pull_request.number || 'latest' }}
-            discovery-service:
-                image: ghcr.io/balhar-jakub/discovery-service:${{ github.event.pull_request.number || 'latest' }}
-                volumes:
-                    - /api-defs:/api-defs
-            gateway-service:
-                image: ghcr.io/balhar-jakub/gateway-service:${{ github.event.pull_request.number || 'latest' }}
-            mock-services:
-                image: ghcr.io/balhar-jakub/mock-services:${{ github.event.pull_request.number || 'latest' }}
-                env:
-                    ZOSMF_APPLIEDAPARS: AuthenticateApar
-            redis-master:
-                image: redis:latest
-                ports:
-                    - "6379:6379"
-
-            redis-replica:
-                image: redis:latest
-                ports:
-                    - "6380:6380"
-
-        steps:
-            -   uses: actions/checkout@v2
-                with:
-                    ref: ${{ github.head_ref }}
-
-            -   uses: ./.github/actions/setup
-
-            -   name: Build with Gradle
-                run: >
-                    ./gradlew :integration-tests:runCachingServiceTests --info -Denvironment.config=-docker -Denvironment.offPlatform=true
-                    -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
-
-            -   uses: ./.github/actions/dump-jacoco
-                if: always()
-
-            -   name: Store results
-                uses: actions/upload-artifact@v3
-                if: always()
-                with:
-                    name: ContainerCITestsWithRedis-${{ env.JOB_ID }}
-                    path: |
-                        integration-tests/build/reports/**
-                        results/**
-            -   uses: ./.github/actions/teardown
-
     CITestsWithRedisWithoutSslVerification:
         needs: PublishJibContainers
         runs-on: ubuntu-latest
@@ -451,8 +387,8 @@ jobs:
             caching-service:
                 image: ghcr.io/balhar-jakub/caching-service:${{ github.event.pull_request.number || 'latest' }}
                 env:
-                    ZWE_CACHING_SERVICE_PERSISTENT: 'redis'
-                    CACHING_STORAGE_REDIS_MASTERNODEURI: 'default:heslo@localhost:6379'
+                    CACHING_STORAGE_MODE: 'redis'
+                    CACHING_STORAGE_REDIS_MASTERNODEURI: 'default:heslo@redis-master:6379'
                     CACHING_STORAGE_REDIS_SSL_ENABLED: false
                     VERIFY_CERTIFICATES: false
             discoverable-client:
@@ -500,6 +436,7 @@ jobs:
                     name: ContainerCITestsWithRedisWithoutSslVerification-${{ env.JOB_ID }}
                     path: |
                         integration-tests/build/reports/**
+                        results/**
 
             -   uses: ./.github/actions/teardown
 
@@ -1136,7 +1073,7 @@ jobs:
             -   uses: ./.github/actions/teardown
 
     PublishResults:
-        needs: [CITests,CITestsWithInfinispan,CITestsZosmfRsu2012,CITestsWithRedis,CITestsInternalPort]
+        needs: [CITests,CITestsWithInfinispan,CITestsZosmfRsu2012,CITestsWithRedisWithoutSslVerification,CITestsInternalPort]
         runs-on: ubuntu-latest
         timeout-minutes: 15
 
@@ -1163,15 +1100,15 @@ jobs:
                     path: containercitestszosmfrsu2012
             -   uses: actions/download-artifact@v3
                 with:
-                    name: ContainerCITestsWithRedis-${{ env.JOB_ID }}
-                    path: containercitestswithredis
+                    name: ContainerCITestsWithRedisWithoutSslVerification-${{ env.JOB_ID }}
+                    path: containercitestswithrediswithoutsslverification
             -   uses: actions/download-artifact@v3
                 with:
                     name: ContainerCITestsInternalPort-${{ env.JOB_ID }}
                     path: containercitestsinternalport
             -   name: Code coverage and publish results
                 run: >
-                    ./gradlew --info coverage sonarqube -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,containercitestswithredis/results,containercitestsinternalport/results"
+                    ./gradlew --info coverage sonarqube -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,containercitestswithrediswithoutsslverification/results,containercitestsinternalport/results"
                     -Psonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_TOKEN
                     -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
                 env:

caching-service/src/main/resources/application.yml

@@ -10,12 +10,6 @@ caching:
                 keyStorePassword: ${server.ssl.keyStorePassword}
                 trustStore: ${server.ssl.trustStore}
                 trustStorePassword: ${server.ssl.trustStorePassword}
-            sentinel:
-                masterInstance: redismaster
-                nodes:
-                    - sentinelpassword@localhost:26379
-                    - sentinelpassword@localhost:26380
-                    - sentinelpassword@localhost:26381
         infinispan:
             initialHosts: localhost[7098]
             persistence:

docker/redis/docker-compose-replica-tls.yml

@@ -7,7 +7,7 @@ services:
         ports:
             - "6379:6379"
         volumes:
-            - ../keystore:/usr/local/etc/keystore
+            - ../../keystore:/usr/local/etc/keystore
             - ./config:/usr/local/etc/redis/
 
     redis-replica:
@@ -17,7 +17,7 @@ services:
         ports:
             - "6380:6380"
         volumes:
-            - ../keystore:/usr/local/etc/keystore
+            - ../../keystore:/usr/local/etc/keystore
             - ./config:/usr/local/etc/redis/
         links:
             - redis-master