more overall fixes

subugoe · Mar 20, 2024 · d843dbd · d843dbd
1 parent fc6c42e
commit d843dbd
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 18 deletions.
diff --git a/.env b/.env
@@ -9,13 +9,14 @@ OPERANDI_HARVESTER_DEFAULT_PASSWORD=operandi
 
 OPERANDI_HPC_USERNAME=mmustaf
 OPERANDI_HPC_PROJECT_NAME=operandi
-OPERANDI_HPC_SSH_KEYPATH=/home/mm/.ssh/gwdg_hpc_key
+OPERANDI_HPC_SSH_KEYPATH=/home/mm/.ssh/gwdg-cluster
 
 OPERANDI_SERVER_DEFAULT_USERNAME=operandi
 OPERANDI_SERVER_DEFAULT_PASSWORD=operandi
 OPERANDI_SERVER_HOST=operandi-server-docker-host
 OPERANDI_SERVER_PORT=8000
-OPERANDI_SERVER_URL=http://${OPERANDI_SERVER_HOST}.${DOCKER_OPERANDI_NETWORK_NAME}:${OPERANDI_SERVER_PORT}
+OPERANDI_SERVER_URL_LOCAL=http://0.0.0.0:8000
+OPERANDI_SERVER_URL_LIVE=http://${OPERANDI_SERVER_HOST}.${DOCKER_OPERANDI_NETWORK_NAME}:${OPERANDI_SERVER_PORT}
 
 MONGODB_NAME=operandi_db
 MONGODB_USER=operandi

diff --git a/.github/workflows/ci_cd.env b/.github/workflows/ci_cd.env
@@ -15,7 +15,8 @@ OPERANDI_SERVER_DEFAULT_USERNAME=operandi_test
 OPERANDI_SERVER_DEFAULT_PASSWORD=operandi_test
 OPERANDI_SERVER_HOST=operandi-server-docker-host-test
 OPERANDI_SERVER_PORT=8000
-OPERANDI_SERVER_URL=http://operandi-server-docker-host-test.operandi_network_test:8000
+OPERANDI_SERVER_URL_LOCAL=http://0.0.0.0:8000
+OPERANDI_SERVER_URL_LIVE=http://operandi-server-docker-host-test.operandi_network_test:8000
 
 MONGODB_NAME=operandi_db_test
 MONGODB_USER=operandi_test

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -71,10 +71,10 @@ services:
       OPERANDI_SERVER_BASE_DIR: /operandi-data
       OPERANDI_SERVER_DEFAULT_USERNAME: ${OPERANDI_SERVER_DEFAULT_USERNAME}
       OPERANDI_SERVER_DEFAULT_PASSWORD: ${OPERANDI_SERVER_DEFAULT_PASSWORD}
-      OPERANDI_SERVER_URL_LIVE: ${OPERANDI_SERVER_URL}
-      OPERANDI_SERVER_URL_LOCAL: http://0.0.0.0:8000
+      OPERANDI_SERVER_URL_LIVE: ${OPERANDI_SERVER_URL_LIVE}
+      OPERANDI_SERVER_URL_LOCAL: ${OPERANDI_SERVER_URL_LOCAL}
     healthcheck:
-      test: curl -f http://0.0.0.0:8000/
+      test: curl -f ${OPERANDI_SERVER_URL_LOCAL}/
       interval: 1s
       timeout: 3s
       retries: 30
@@ -106,7 +106,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ${OPERANDI_LOGS_DIR}:/operandi-logs
       - ${OPERANDI_SERVER_BASE_DIR}:/operandi-data
-      - ${OPERANDI_HPC_SSH_KEYPATH}:/home/root/.ssh/gwdg_hpc_key
+      - ${OPERANDI_HPC_SSH_KEYPATH}:/home/root/.ssh/gwdg_hpc_key:ro
     command: operandi-broker start
 
   operandi-run-tests:
@@ -123,9 +123,18 @@ services:
       MONGODB_NAME: ${MONGODB_NAME}
       MONGODB_URL: ${MONGODB_URL}
       RABBITMQ_URL: ${RABBITMQ_URL}
-      OPERANDI_SERVER_URL: ${OPERANDI_SERVER_URL}
+      OPERANDI_HPC_PROJECT_NAME: ${OPERANDI_HPC_PROJECT_NAME}
+      OPERANDI_HPC_USERNAME: ${OPERANDI_HPC_USERNAME}
+      OPERANDI_HPC_SSH_KEYPATH: /home/root/.ssh/gwdg_hpc_key
+      OPERANDI_HARVESTER_DEFAULT_USERNAME: ${OPERANDI_HARVESTER_DEFAULT_USERNAME}
+      OPERANDI_HARVESTER_DEFAULT_PASSWORD: ${OPERANDI_HARVESTER_DEFAULT_PASSWORD}
       OPERANDI_LOGS_DIR: /operandi-logs
       OPERANDI_SERVER_BASE_DIR: /operandi-data
+      OPERANDI_SERVER_DEFAULT_USERNAME: ${OPERANDI_SERVER_DEFAULT_USERNAME}
+      OPERANDI_SERVER_DEFAULT_PASSWORD: ${OPERANDI_SERVER_DEFAULT_PASSWORD}
+      OPERANDI_SERVER_URL_LIVE: ${OPERANDI_SERVER_URL_LIVE}
     volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
       - ${OPERANDI_LOGS_DIR}:/operandi-logs
       - ${OPERANDI_SERVER_BASE_DIR}:/operandi-data
+      - ${OPERANDI_HPC_SSH_KEYPATH}:/home/root/.ssh/gwdg_hpc_key:ro
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -71,10 +71,10 @@ services:
       OPERANDI_SERVER_BASE_DIR: /operandi-data
       OPERANDI_SERVER_DEFAULT_USERNAME: ${OPERANDI_SERVER_DEFAULT_USERNAME}
       OPERANDI_SERVER_DEFAULT_PASSWORD: ${OPERANDI_SERVER_DEFAULT_PASSWORD}
-      OPERANDI_SERVER_URL_LIVE: ${OPERANDI_SERVER_URL}
-      OPERANDI_SERVER_URL_LOCAL: http://0.0.0.0:8000
+      OPERANDI_SERVER_URL_LIVE: ${OPERANDI_SERVER_URL_LIVE}
+      OPERANDI_SERVER_URL_LOCAL: ${OPERANDI_SERVER_URL_LOCAL}
     healthcheck:
-      test: curl -f http://0.0.0.0:8000/
+      test: curl -f ${OPERANDI_SERVER_URL_LOCAL}/
       interval: 1s
       timeout: 3s
       retries: 30
@@ -106,5 +106,5 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ${OPERANDI_LOGS_DIR}:/operandi-logs
       - ${OPERANDI_SERVER_BASE_DIR}:/operandi-data
-      - ${OPERANDI_HPC_SSH_KEYPATH}:/home/root/.ssh/gwdg_hpc_key
+      - ${OPERANDI_HPC_SSH_KEYPATH}:/home/root/.ssh/gwdg_hpc_key:ro
     command: operandi-broker start
diff --git a/tests/.env b/tests/.env
@@ -9,13 +9,14 @@ OPERANDI_HARVESTER_DEFAULT_PASSWORD=operandi_test
 
 OPERANDI_HPC_USERNAME=mmustaf
 OPERANDI_HPC_PROJECT_NAME=operandi_tests
-OPERANDI_HPC_SSH_KEYPATH=/home/mm/.ssh/gwdg_hpc_key
+OPERANDI_HPC_SSH_KEYPATH=/home/mm/.ssh/gwdg-cluster
 
 OPERANDI_SERVER_DEFAULT_USERNAME=operandi_test
 OPERANDI_SERVER_DEFAULT_PASSWORD=operandi_test
 OPERANDI_SERVER_HOST=operandi-server-docker-host-test
 OPERANDI_SERVER_PORT=8000
-OPERANDI_SERVER_URL=http://${OPERANDI_SERVER_HOST}.${DOCKER_OPERANDI_NETWORK_NAME}:${OPERANDI_SERVER_PORT}
+OPERANDI_SERVER_URL_LOCAL=http://0.0.0.0:8000
+OPERANDI_SERVER_URL_LIVE=http://${OPERANDI_SERVER_HOST}.${DOCKER_OPERANDI_NETWORK_NAME}:${OPERANDI_SERVER_PORT}
 
 MONGODB_NAME=operandi_db_test
 MONGODB_USER=operandi_test

diff --git a/tests/test_integration_5_server_1_root.py b/tests/test_integration_5_server_1_root.py
@@ -1,7 +1,7 @@
 from os import environ
 from requests import get as requests_get
 
-OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL")
+OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL_LIVE")
 
 
 def test_get_root_info():

diff --git a/tests/test_integration_5_server_2_workflow.py b/tests/test_integration_5_server_2_workflow.py
@@ -7,7 +7,7 @@
 from operandi_utils.database import sync_db_get_workflow
 from tests.helpers.asserts import assert_exists_wf_db_resource, assert_local_dir_workflow
 
-OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL")
+OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL_LIVE")
 
 
 def test_post_workflow_script(auth, bytes_template_workflow):

diff --git a/tests/test_integration_5_server_3_workspace.py b/tests/test_integration_5_server_3_workspace.py
@@ -16,7 +16,7 @@
     assert_local_dir_workspace_not
 )
 
-OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL")
+OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL_LIVE")
 
 
 def test_post_workspace_url(auth):

diff --git a/tests/test_integration_6_harvester.py b/tests/test_integration_6_harvester.py
@@ -5,7 +5,7 @@
 
 from operandi_utils.constants import StateJob
 
-OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL")
+OPERANDI_SERVER_URL = environ.get("OPERANDI_SERVER_URL_LIVE")
 
 
 def test_full_cycle(auth_harvester, bytes_default_workflow, bytes_small_workspace):