diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db820eca43b8f07941e4c1ea810c4da06a50c2cc..c863f4a84a79cce534096a35bb0b97eeb207f3c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,9 @@ test: - ./env_setup.sh - docker swarm init - docker stack deploy -c docker-compose.vhr18.yml -c docker-compose.vhr18.dev.yml vhr18-pvs - - docker exec -it $(docker ps -qf "name=vhr18-pvs_renderer") python3 /var/www/pvs/dev/pvs_instance/manage.py id list + - docker ps + - docker ps -qf "name=vhr18-pvs_renderer" + # - docker exec -it $(docker ps -qf "name=vhr18-pvs_renderer") python3 /var/www/pvs/dev/pvs_instance/manage.py id list # after_script: # - docker stack rm vhr18-pvs # - docker volume rm vhr18-pvs_db-data diff --git a/env_setup.sh b/env_setup.sh index a1460c59e0f009f7bf8275f669def6057e8d96e0..c106611e745a46536afd6e2995c8a60a63cb9317 100644 --- a/env_setup.sh +++ b/env_setup.sh @@ -1,4 +1,8 @@ #!/bin/sh cat $vhr18_db > ./env/vhr18_db.env cat $vhr18_django > ./env/vhr18_django.env -cat $vhr_obs > ./env/vhr18_obs.env +cat $vhr18_obs > ./env/vhr18_obs.env + +cat $emg_db > ./env/emg_db.env +cat $emg_django > ./env/emg_django.env +cat $emg_obs > ./env/emg_obs.env