Fix CI pre-release (#107)

* fix: github action * fix: temporary retrieve `pyeudiw` from github repo * fix: add `eudi` branch into CI triggers * chore: linting and container status info * fix: missing dependencies in CI host machine * fix: wait container startup * fix: add healthcheck --------- Co-authored-by: Salvatore Laiso <[email protected]>
italia · Jan 24, 2024 · 267ff8d · 267ff8d
1 parent 396fc1f
commit 267ff8d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -5,9 +5,9 @@ name: Satosa-Saml2Spid
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ master, dev, eudi ]
   pull_request:
-    branches: [ master, dev ]
+    branches: [ master, dev, eudi ]
 
 jobs:
   build:
@@ -22,6 +22,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install xmlsec1
+      run: sudo apt-get install -y xmlsec1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -38,12 +40,13 @@ jobs:
         flake8 --max-line-length 120 --count --exit-zero --statistics example
     - name: Create docker-example folder
       run: |
-          mkdir -p docker-example
-          cp -r example/. docker-example
+        mkdir -p docker-example
+        cp -r example/. docker-example
     - name: docker compose
       run: |       
         cd Docker-compose
-        docker compose -f docker-compose.yml up -d    
+        ./run-docker-compose.sh
+        docker ps -a
     - name: djangosaml2 SP metadata to Proxy
       run: |
         wget http://localhost:8000/saml2/metadata -O example/metadata/sp/djangosaml2_sp.xml
@@ -67,4 +70,4 @@ jobs:
     - name: spid-sp-test eIDAS FiCEP metadata
       run: |
         cd docker-example
-        spid_sp_test --profile ficep-eidas-sp --metadata-url https://localhost/spidSaml2/metadata
+        spid_sp_test --profile ficep-eidas-sp --metadata-url https://localhost/spidSaml2/metadata
diff --git a/Docker-compose/docker-compose.yml b/Docker-compose/docker-compose.yml
@@ -117,6 +117,12 @@ services:
     entrypoint: "sh entrypoint.sh"
     networks:
       - satosa-saml2spid
+    healthcheck:
+      test: curl --fail http://localhost/SAML2IDP/metadata || exit 1
+      interval: 2s
+      retries: 10
+      start_period: 10s
+      timeout: 10s
 
   satosa-nginx:
     image: nginx:alpine

diff --git a/Docker-compose/run-docker-compose.sh b/Docker-compose/run-docker-compose.sh
@@ -35,7 +35,7 @@ echo -e "\n"
 
 echo -e "Tiro su la composizione, in caso, con le nuove versioni delle immagini. \n"
 
-docker compose -f docker-compose.yml up -d
+docker compose -f docker-compose.yml up -d --wait --wait-timeout 60
 
 echo -e "\n"
 

diff --git a/requirements.txt b/requirements.txt
@@ -11,7 +11,7 @@ jinja2
 
 # Wallet RP
 # pyeudiw[satosa,federation]
-pyeudiw
+git+https://github.com/italia/eudi-wallet-it-python@dev
 
 Pillow>=10.0.0,<10.1
 device_detector>=5.0,<6