Fix tests and improve ci job following @Zerpet advice

Author: MarcialRosales

.github/workflows/authorization-server-make.yaml

@@ -23,19 +23,15 @@ jobs:
       - name: CHECKOUT REPOSITORY
         uses: actions/checkout@v4
 
-      - name: Prepare image        
-        run: |
-          ls        
-          echo "Building spring authorization server"
-          cd selenium/authorization-server
-          docker build . -t authorization-server
-          docker tag authorization-server ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }} 
-      -
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      - name: Push
-        run: |
-          docker push ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}
+      
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        context: selenium/authorization-server
+        with:
+          push: true
+          tags: ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}

selenium/bin/components/uaa

@@ -24,7 +24,7 @@ start_uaa() {
   begin "Starting UAA ..."
 
   init_uaa
-  kill_container_if_exist uaa
+  kill_container_if_exist uaa 
 
   MOUNT_UAA_CONF_DIR=$CONF_DIR/uaa
 
@@ -44,6 +44,7 @@ start_uaa() {
     --env JAVA_OPTS="-Djava.security.policy=unlimited -Djava.security.egd=file:/dev/./urandom" \
     ${UAA_DOCKER_IMAGE}
 
-  wait_for_oidc_endpoint uaa $UAA_URL
+  wait_for_message uaa "Server startup in" 20 10
+  wait_for_oidc_endpoint uaa $UAA_URL $MOUNT_UAA_CONF_DIR/ca_uaa_certificate.pem
   end "UAA is ready"
 }

selenium/test/oauth/env.docker.fakeportal.spring

@@ -0,0 +1 @@
+export IDP_TOKEN_ENDPOINT=https://spring:8443/oauth2/token

selenium/test/oauth/env.docker.fakeportal.uaa

@@ -0,0 +1 @@
+export IDP_TOKEN_ENDPOINT=https://uaa:8443/oauth/token

selenium/test/oauth/env.local.fakeportal.spring

@@ -0,0 +1 @@
+export IDP_TOKEN_ENDPOINT=https://spring:8443/oauth2/token

selenium/test/oauth/env.local.fakeportal.uaa

@@ -0,0 +1 @@
+export IDP_TOKEN_ENDPOINT=https://uaa:8443/oauth/token

selenium/test/oauth/env.spring

@@ -0,0 +1,4 @@
+export OAUTH_SERVER_CONFIG_DIR=${OAUTH_SERVER_CONFIG_BASEDIR}/oauth/spring
+export OAUTH_SCOPES="openid profile"
+export OAUTH_CLIENT_ID=rabbitmq_client_code
+export IDP=spring 

selenium/test/oauth/env.uaa

@@ -2,3 +2,4 @@ export OAUTH_SIGNING_KEY_ID=legacy-token-key
 export OAUTH_SERVER_CONFIG_DIR=${OAUTH_SERVER_CONFIG_BASEDIR}/oauth/uaa
 export OAUTH_CLIENT_SECRET=rabbitmq_client_code
 export OAUTH_SCOPES="openid profile rabbitmq.*"
+export IDP=uaa