From 5eaf648a4aa9f4ad594b2fe9660eaa9b9b740ca3 Mon Sep 17 00:00:00 2001 From: ThanKarab Date: Sun, 22 Sep 2024 15:59:31 +0300 Subject: [PATCH] chore: Minor fixes to update dev deployment setup --- dev/start.sh | 8 ++------ dev/test.sh | 4 ++++ dev/tests/test_federation_info.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/start.sh b/dev/start.sh index 2e6bb42a..f7036d00 100755 --- a/dev/start.sh +++ b/dev/start.sh @@ -3,17 +3,13 @@ docker-compose --env-file ../.versions_env down docker-compose --env-file ../.versions_env up -d -echo -n "Installing pip requirements ..." -pip install -r requirements.txt - echo -n "Waiting for containers to start ..." sleep 10 echo -n "Loading data into exareme2 db ..." -docker exec dev-exareme2_global_mipdb-1 mipdb init -docker exec dev-exareme2_local_mipdb-1 /bin/bash -c "mipdb init && mipdb load-folder /opt/data" +docker exec dev_exareme2_local_mipdb_1 /bin/bash -c "mipdb init && mipdb load-folder /opt/data" -sleep 10 +sleep 20 echo -n "Triggering engine to see the added pathologies ..." curl -X POST 172.17.0.1:5000/wla diff --git a/dev/test.sh b/dev/test.sh index 5dccf476..44c99df6 100755 --- a/dev/test.sh +++ b/dev/test.sh @@ -1,5 +1,9 @@ #!/bin/env bash +echo -n "Installing pip requirements ..." +pip install -r requirements.txt + +echo -n "Running tests..." pytest -k "not test_federation_info.py" tests pytest tests/test_federation_info.py diff --git a/dev/tests/test_federation_info.py b/dev/tests/test_federation_info.py index 16bfeefd..25aab4e2 100644 --- a/dev/tests/test_federation_info.py +++ b/dev/tests/test_federation_info.py @@ -6,7 +6,7 @@ def test_federation_info(): - cmd = f"docker logs dev-portalbackend-1 | python3 ../federation_info.py show-portal-backend-audit-entries" + cmd = f"docker logs dev_portalbackend_1 | python3 ../federation_info.py show-portal-backend-audit-entries" res = subprocess.run( cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE )