fix

pagopa · May 21, 2024 · 586219b · 586219b
1 parent c96b992
commit 586219b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 43 deletions.
diff --git a/.github/workflows/ci_code_review.yml b/.github/workflows/ci_code_review.yml
@@ -60,35 +60,25 @@ jobs:
           tenant-id: ${{ secrets.DEV_TENANT_ID }}
           subscription-id: ${{ secrets.DEV_SUBSCRIPTION_ID }}
 
-      - name: send
-        id: cat
+      - name: Run Service on Docker
         shell: bash
+        id: run_service_docker
         run: |
-          cd ./docker 
+          cd ./docker
           chmod +x ./run_docker.sh
           ./run_docker.sh local
-          
-          cat .env
 
-#      - name: Run Service on Docker
-#        shell: bash
-#        id: run_service_docker
-#        run: |
-#          cd ./docker
-#          chmod +x ./run_docker.sh
-#          ./run_docker.sh local
-#
-#      - name: Run Integration Tests
-#        shell: bash
-#        id: run_integration_test
-#        run: |
-#          export SUBKEY=${{ secrets.DEV_SUBKEY }}
-#          export CANARY=${{ inputs.canary }}
-#          export CUCUMBER_PUBLISH_TOKEN=${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
-#
-#          cd ./integration-test
-#          chmod +x ./run_integration_test.sh
-#          ./run_integration_test.sh local
+      - name: Run Integration Tests
+        shell: bash
+        id: run_integration_test
+        run: |
+          export SUBKEY=${{ secrets.DEV_SUBKEY }}
+          export CANARY=${{ inputs.canary }}
+          export CUCUMBER_PUBLISH_TOKEN=${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
+
+          cd ./integration-test
+          chmod +x ./run_integration_test.sh
+          ./run_integration_test.sh local
 
 
 
diff --git a/docker/run_docker.sh b/docker/run_docker.sh
@@ -42,22 +42,22 @@ for line in $(echo "$secret" | jq -r '. | to_entries[] | select(.key) | "\(.key)
 done
 
 
-#stack_name=$(cd .. && basename "$PWD")
-#docker compose -p "${stack_name}" up --remove-orphans --force-recreate --build
-#
-#
-## waiting the containers
-#printf 'Waiting for the service'
-#attempt_counter=0
-#max_attempts=50
-#until $(curl --output /dev/null --silent --head --fail http://localhost:8080/actuator/info); do
-#    if [ ${attempt_counter} -eq ${max_attempts} ];then
-#      echo "Max attempts reached"
-#      exit 1
-#    fi
-#
-#    printf '.'
-#    attempt_counter=$((attempt_counter+1))
-#    sleep 5
-#done
-#echo 'Service Started'
+stack_name=$(cd .. && basename "$PWD")
+docker compose -p "${stack_name}" up --remove-orphans --force-recreate --build
+
+
+# waiting the containers
+printf 'Waiting for the service'
+attempt_counter=0
+max_attempts=50
+until $(curl --output /dev/null --silent --head --fail http://localhost:8080/actuator/info); do
+    if [ ${attempt_counter} -eq ${max_attempts} ];then
+      echo "Max attempts reached"
+      exit 1
+    fi
+
+    printf '.'
+    attempt_counter=$((attempt_counter+1))
+    sleep 5
+done
+echo 'Service Started'