Skip to content

Commit

Permalink
chore: Minor fixes to update dev deployment setup
Browse files Browse the repository at this point in the history
  • Loading branch information
ThanKarab committed Nov 1, 2024
1 parent 79ebec8 commit 49d87b8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 20 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/portalbackend-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

- name: Install Docker Compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/$(curl -s https://api.github.com/repos/docker/compose/releases/latest | grep tag_name | cut -d '"' -f 4)/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
docker-compose --version
- name: Install docker compose
uses: KengoTODA/actions-setup-docker-compose@v1
with:
version: '2.30.1'

- name: Docker compose version
run: docker compose version

- name: Deploy portalbackend and exareme2
working-directory: ./dev/
Expand All @@ -31,6 +33,10 @@ jobs:
- name: Get deployment status
run: docker ps

- name: Install python dependencies
working-directory: ./dev/
run: pip install -r requirements.txt

- name: Run the dev tests
working-directory: ./dev/
run: pytest -k "not test_federation_info.py"
Expand Down
11 changes: 4 additions & 7 deletions dev/start.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
#!/bin/env bash

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
docker compose --env-file ../.versions_env down
docker compose --env-file ../.versions_env up -d

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
Expand Down
5 changes: 0 additions & 5 deletions dev/test.sh

This file was deleted.

2 changes: 1 addition & 1 deletion dev/tests/test_federation_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down

0 comments on commit 49d87b8

Please sign in to comment.