Commit 8235a912 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

minor fixes

parent 458c1c71

services/check_services_are_running.sh

+30 −3
Original line number Diff line number Diff line 
#!/bin/bash

export CAPIF_PRIV_KEY=

export CAPIF_PRIV_KEY_BASE_64=

export MONITORING=



running="$(docker compose -f docker-compose-vault.yml ps --services --all --filter "status=running")"

services="$(docker compose -f docker-compose-vault.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following Vault services are not running:"

    # Bash specific

    comm -13 <(sort <<<"$running") <(sort <<<"$services")

    exit 1

else

    echo "All Vault services are running"

fi



running="$(docker compose -f docker-compose-capif.yml ps --services --all --filter "status=running")"

services="$(docker compose -f docker-compose-capif.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following services are not running:"

    echo "Following CCF services are not running:"

    # Bash specific

    comm -13 <(sort <<<"$running") <(sort <<<"$services")

    exit 1

else

    echo "All services are running"

    exit 0

    echo "All CCF services are running"

fi



running="$(docker compose -f docker-compose-register.yml ps --services --all --filter "status=running")"

services="$(docker compose -f docker-compose-register.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following Register services are not running:"

    # Bash specific

    comm -13 <(sort <<<"$running") <(sort <<<"$services")

    exit 1

else

    echo "All Register services are running"

fi



exit 0

services/docker-compose-capif.yml

+0 −2
Original line number Diff line number Diff line 
version: '3.7'



services:

  redis:

    image: "redis:alpine"

services/docker-compose-register.yml

+0 −2
Original line number Diff line number Diff line 
version: '3.7'



services:

  register:

    build:

services/docker-compose-vault.yml

+0 −1
Original line number Diff line number Diff line 
version: '3.7'

services:

  vault:

    build:

tests/libraries/mock_server/run_mock_server.sh→services/run_mock_server.sh

+6 −2
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ help() { 
  exit 1

}



cd ..

REPOSITORY_BASE_FOLDER=${PWD}

MOCK_SERVER_FOLDER=${PWD}/tests/libraries/mock_server



IP=0.0.0.0

PORT=9090
@@ -35,6 +39,6 @@ while getopts ":i:p:h" opt; do 
done



echo Robot Framework Mock Server will listen on $IP:$PORT

pip install -r requirements.txt

pip install -r ${MOCK_SERVER_FOLDER}/requirements.txt



IP=$IP PORT=$PORT python mock_server.py
 
IP=$IP PORT=$PORT python ${MOCK_SERVER_FOLDER}/mock_server.py