test: trigger ci/cd

subugoe · Oct 4, 2023 · ca0aae6 · ca0aae6
1 parent df886c6
commit ca0aae6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.env b/.env
@@ -6,7 +6,10 @@ OPERANDI_HPC_USERNAME=mmustaf
 OPERANDI_HPC_SSH_KEYPATH=/home/mm/.ssh/gwdg-cluster
 OPERANDI_HPC_PROJECT_NAME=operandi
 OPERANDI_LOGS_DIR=/tmp/operandi_logs
-OPERANDI_RABBITMQ_URL=amqp://operandi_user:operandi_password@localhost:5672/
+OPERANDI_RABBITMQ_JSON_CONFIG=./src/rabbitmq_definitions.json
+OPERANDI_RABBITMQ_USER=operandi_user
+OPERANDI_RABBITMQ_PASS=operandi_password
+OPERANDI_RABBITMQ_URL=amqp://${OPERANDI_RABBITMQ_USER}:${OPERANDI_RABBITMQ_PASS}@localhost:5672/
 OPERANDI_SERVER_BASE_DIR=/tmp/operandi_data
 OPERANDI_SERVER_DEFAULT_USERNAME=server_operandi
 OPERANDI_SERVER_DEFAULT_PASSWORD=server_operandi

diff --git a/.github/workflows/tests/.env b/.github/workflows/tests/.env
@@ -6,7 +6,10 @@ OPERANDI_HPC_USERNAME=mmustaf
 OPERANDI_HPC_SSH_KEYPATH=/home/runner/.ssh/key_hpc
 OPERANDI_HPC_PROJECT_NAME=operandi_tests
 OPERANDI_LOGS_DIR=/tmp/operandi_logs_tests
-OPERANDI_RABBITMQ_URL=amqp://operandi_user:operandi_password@localhost:5672/test
+OPERANDI_RABBITMQ_JSON_CONFIG=./src/rabbitmq_definitions.json
+OPERANDI_RABBITMQ_USER=operandi_user
+OPERANDI_RABBITMQ_PASS=operandi_password
+OPERANDI_RABBITMQ_URL=amqp://${OPERANDI_RABBITMQ_USER}:${OPERANDI_RABBITMQ_PASS}@localhost:5672/
 OPERANDI_SERVER_BASE_DIR=/tmp/operandi_data_tests
 OPERANDI_SERVER_DEFAULT_USERNAME=operandi_tests_server
 OPERANDI_SERVER_DEFAULT_PASSWORD=operandi_tests_server

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - "/rabbitmq-data/data/:/var/lib/rabbitmq/"
       - "/rabbitmq-data/log/:/var/log/rabbitmq/"
       - type: bind
-        source: ./src/rabbitmq_definitions.json
+        source: ${OPERANDI_RABBITMQ_JSON_CONFIG}
         target: /rmq_definitions.json
     user: ${USER_ID}:${GROUP_ID}
     environment:

diff --git a/docker-compose_image_based.yml b/docker-compose_image_based.yml
@@ -21,7 +21,7 @@ services:
       - "/rabbitmq-data/data/:/var/lib/rabbitmq/"
       - "/rabbitmq-data/log/:/var/log/rabbitmq/"
       - type: bind
-        source: ./src/rabbitmq_definitions.json
+        source: ${OPERANDI_RABBITMQ_JSON_CONFIG}
         target: /rmq_definitions.json
     user: ${USER_ID}:${GROUP_ID}
     environment: