From 479e1608d2da31af08af651c3669274669e850e4 Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Fri, 21 Feb 2020 14:08:48 +0100
Subject: [PATCH] initial passing test
---
.gitlab-ci.yml | 4 +++-
env_setup.sh | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db820eca..c863f4a8 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 a1460c59..c106611e 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
--
GitLab