diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 229b542ccf..0851990735 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,7 +303,7 @@ jobs: - testSuite: AppContext04TestSuite compose-profile: with-transform-core-aio - testSuite: AppContext05TestSuite - compose-profile: default + compose-profile: with-sso mvn-options: '"-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth"' - testSuite: AppContext06TestSuite compose-profile: with-transform-core-aio @@ -327,6 +327,8 @@ jobs: run: bash ./scripts/ci/init.sh - name: "Set transformers tag" run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV + - name: "Set the host IP" + run: echo "HOST_IP=$(hostname -I | cut -f1 -d' ')" >> $GITHUB_ENV - name: "Generate Keystores and Truststores for Mutual TLS configuration" if: ${{ matrix.mtls }} run: | @@ -339,11 +341,7 @@ jobs: echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV" fi - name: "Set up the environment" - run: | - if [ -e ./scripts/ci/tests/${{ matrix.testSuite }}-setup.sh ]; then - bash ./scripts/ci/tests/${{ matrix.testSuite }}-setup.sh - fi - docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d + run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Run tests" run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} - name: "Clean Maven cache" diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index 93f132a039..a6399c6aea 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -10,7 +10,7 @@ services: - "8090:8090" postgres: image: postgres:14.4 - profiles: ["default", "with-transform-core-aio", "postgres", "with-mtls-transform-core-aio"] + profiles: ["default", "with-transform-core-aio", "postgres", "with-mtls-transform-core-aio", "with-sso"] environment: - POSTGRES_PASSWORD=alfresco - POSTGRES_USER=alfresco @@ -19,7 +19,7 @@ services: ports: - "5433:5432" activemq: - profiles: ["default", "with-transform-core-aio", "activemq", "with-mtls-transform-core-aio"] + profiles: ["default", "with-transform-core-aio", "activemq", "with-mtls-transform-core-aio", "with-sso"] image: alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8 ports: - "5672:5672" # AMQP @@ -56,4 +56,16 @@ services: CLIENT_SSL_TRUST_STORE: "file:/tengineAIO.truststore" CLIENT_SSL_TRUST_STORE_PASSWORD: "password" - CLIENT_SSL_TRUST_STORE_TYPE: "JCEKS" \ No newline at end of file + CLIENT_SSL_TRUST_STORE_TYPE: "JCEKS" + keycloak: + profiles: ["with-sso"] + image: quay.io/keycloak/keycloak:21.1.2 + environment: + - 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"] + volumes: + - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json + ports: + - 8999:8080 \ No newline at end of file diff --git a/scripts/ci/tests/AppContext05TestSuite-setup.sh b/scripts/ci/tests/AppContext05TestSuite-setup.sh deleted file mode 100644 index c8458de3c8..0000000000 --- a/scripts/ci/tests/AppContext05TestSuite-setup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -echo "=========================== Starting AppContext05TestSuite setup ===========================" -PS4="\[\e[35m\]+ \[\e[m\]" -set -vex -pushd "$(dirname "${BASH_SOURCE[0]}")/../../../" - -mkdir -p "${HOME}/tmp" -cp repository/src/test/resources/realms/alfresco-realm.json "${HOME}/tmp" -echo "HOST_IP=$(hostname -I | cut -f1 -d' ')" >> $GITHUB_ENV -docker run -d -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e DB_VENDOR=h2 -p 8999:8080 -e KEYCLOAK_IMPORT=/tmp/alfresco-realm.json -v $HOME/tmp/alfresco-realm.json:/tmp/alfresco-realm.json alfresco/alfresco-identity-service:1.2 - -popd -set +vex -echo "=========================== Finishing AppContext05TestSuite setup ==========================" \ No newline at end of file