From f994264e95275e32d984aa0f0a9dda878d7e9013 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Fri, 3 May 2019 11:31:57 +0200
Subject: [PATCH] testing ci

---
 .gitlab-ci.yml | 5 +++--
 test.sh        | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b413a0c8..1ad7f3ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,8 +55,9 @@ test metager3:
   script:
     - cd ~/MetaGer_neu 
     - sh test.sh
-    - kill $browserstackPid
-    - kill $servePid
+  after_script:
+    - kill `cat ~/browserstackPid` && rm ~/browserstackPid
+    - kill `cat ~/servePid` && rm ~/servePid
 
 deploy metager3:
   stage: deploy
diff --git a/test.sh b/test.sh
index 0e111881..3b6c495e 100644
--- a/test.sh
+++ b/test.sh
@@ -5,12 +5,14 @@ set -e
 cd ~/MetaGer_neu
 
 # Start Webserver
-php artisan serve --port 8005 >/dev/null 2>&1 &
-servePid=$!
+nohup php artisan serve --port 8005 >/dev/null 2>&1 &
+echo $! > ~/servePid
+disown
 
 # Start the Browserstack Proxy
 ~/BrowserStackLocal --key gCyHqmJnNwLhp96LgiVG 2>&1 &
-browserstackPid=$!
+echo $! > ~/browserstackPid
+disown
 sleep 5
 
 ./vendor/bin/phpunit
\ No newline at end of file
-- 
GitLab