ACS-8862 Bump to Keycloak 25.0.6 (#2945)

Co-authored-by: Aleksandra Onych <aleksandra.onych@hyland.com>
Alfresco · Oct 9, 2024 · 723ff53 · 723ff53
1 parent 0abfdfa
commit 723ff53
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -225,14 +225,17 @@ jobs:
           - testSuite: REST API
             pom: tests/tas-restapi/pom.xml
             profiles: all-tas-tests,run-restapi-aims
+            log-folder: tests/tas-restapi
             deploy-timeout: 60
           - testSuite: CMIS - BROWSER binding
             pom: tests/tas-cmis/pom.xml
             profiles: all-tas-tests,run-cmis-browser-with-aims
+            log-folder: tests/tas-cmis
             deploy-timeout: 40
           - testSuite: CMIS - ATOM binding
             pom: tests/tas-cmis/pom.xml
             profiles: all-tas-tests,run-cmis-atom-with-aims
+            log-folder: tests/tas-cmis
             deploy-timeout: 40
     steps:
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
@@ -246,19 +249,23 @@ jobs:
         run: |
           bash ./scripts/ci/init.sh
           bash ./scripts/ci/build.sh
-      - name: "Set HOST_IP"
-        run: echo "HOST_IP=$(hostname  -I | cut -f1 -d' ')" >> $GITHUB_ENV
       - name: "Set up the environment"
+        id: env
         run: |
           ${{ env.TAS_SCRIPTS }}/start-compose.sh ${{ env.TAS_ENVIRONMENT }}/docker-compose-aims.yml
           ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" 180
       - name: "Run tests"
         id: tests
         timeout-minutes: ${{ matrix.deploy-timeout }}
-        run: mvn -B install -ntp -f ${{ matrix.pom }} -P${{ matrix.profiles }} -Denvironment=aims-environment -DrunBugs=false "-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth"
+        run: |
+          HOST_IP=$(hostname  -I | cut -f1 -d' ')
+          mvn -B install -ntp -f ${{ matrix.pom }} -P${{ matrix.profiles }} -Denvironment=aims-environment -DrunBugs=false "-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth"
       - name: "Print output after failure"
-        if: ${{ always() && matrix.testSuite == 'REST API' && steps.tests.outcome == 'failure' }}
-        run: ${TAS_SCRIPTS}/output_logs_for_failures.sh "tests/tas-restapi"
+        if: ${{ always() && steps.tests.outcome == 'failure' }}
+        run: ${TAS_SCRIPTS}/output_logs_for_failures.sh ${{ matrix.log-folder }}
+      - name: "Dump all Docker containers logs"
+        uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v7.0.0
+        if: failure() && (steps.tests.outcome == 'failure' || steps.env.outcome == 'failure')
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 

diff --git a/tests/environment/.env b/tests/environment/.env
@@ -6,7 +6,7 @@ MARIADB_TAG=10.6
 MSSQL_TAG=2019-CU28-ubuntu-20.04
 ORACLE_TAG=19.3.0-ee
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
-KEYCLOAK_TAG=24.0.3
+KEYCLOAK_TAG=25.0.6
 SYNC_SERVICE_TAG=5.1.0-M2
 TRANSFORM_ROUTER_TAG=4.1.5-A1
 TRANSFORM_CORE_AIO_TAG=5.1.5-A1

diff --git a/tests/environment/docker-compose-aims.yml b/tests/environment/docker-compose-aims.yml
@@ -17,14 +17,6 @@ services:
     build:
       context: ./alfresco-with-jolokia
     environment:
-      # use 'export HOST_IP=xxx' for specifying the host ip before starting docker compose
-      # the following line will produce the result using 'ifconfig'
-      # export HOST_IP=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1)
-      # the following 2 lines will produce the result using 'ip address show'
-      # The first line's output is "11.222.11.222/23"
-      # export HOST_IP=$(ip address show | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | head -n 1 )
-      # export HOST_IP=$(echo ${HOST_IP%/*})
-      HOST_IP: ${HOST_IP}
       CATALINA_OPTS : "-agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n"
       JAVA_TOOL_OPTIONS: "
         -Dencryption.keystore.type=JCEKS
@@ -57,7 +49,7 @@ services:
         -Dlegacy.transform.service.enabled=false
         -Dauthentication.chain=identity-service1:identity-service,alfrescoNtlm1:alfrescoNtlm
         -Didentity-service.enable-basic-auth=true
-        -Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth
+        -Didentity-service.auth-server-url=http://keycloak:8999/auth
         -Didentity-service.realm=alfresco
         -Didentity-service.resource=alfresco
         "
@@ -112,8 +104,8 @@ services:
       - KEYCLOAK_ADMIN=admin
       - KEYCLOAK_ADMIN_PASSWORD=admin
       - KC_DB=dev-mem
-    command: ["start-dev", "--import-realm", "--http-relative-path=/auth", "--hostname=localhost", "--http-enabled=true"]
+    command: ["start-dev", "--import-realm", "--http-relative-path=/auth", "--hostname=http://keycloak:8999/auth", "--http-enabled=true", "--http-port=8999"]
     volumes:
       - ./realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json
     ports:
-      - 8999:8080
+      - 8999:8999