From 7ee379c0ad46cc6492a8cdbb95344337271cdaf8 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 18 Jan 2016 02:35:48 +0100
Subject: [PATCH] Moved IP and PORTs to server config.

---
 .gitlab-ci.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a978e7085..9935ddd19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,6 @@ job_unit:
     - core
   script:
     - export RAILS_ENV=test
-    - export Z_LOCALES=en-us:de-de
     - rake db:drop;
     - rake db:create
     - rake db:migrate
@@ -206,8 +205,6 @@ job_integration_twitter_ff:
     - browser-ff
     - twitter
   script:
-    - export BROWSER_PORT=3041
-    - export WS_PORT=3042
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
@@ -223,8 +220,6 @@ job_integration_facebook_ff:
     - browser-ff
     - facebook
   script:
-    - export BROWSER_PORT=3051
-    - export WS_PORT=3052
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
@@ -239,8 +234,6 @@ job_integration_autowizard_ff:
   tags:
     - browser-ff
   script:
-    - export BROWSER_PORT=3001
-    - export WS_PORT=3002
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_example.json auto_wizard.json
@@ -255,8 +248,6 @@ job_integration_browser_ff_1:
   tags:
     - browser-ff
   script:
-    - export BROWSER_PORT=3011
-    - export WS_PORT=3012
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
@@ -275,8 +266,6 @@ job_integration_browser_ff_2:
   tags:
     - browser-ff
   script:
-    - export BROWSER_PORT=3021
-    - export WS_PORT=3022
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
@@ -295,8 +284,6 @@ job_integration_browser_ff_3:
   tags:
     - browser-ff
   script:
-    - export BROWSER_PORT=3031
-    - export WS_PORT=3032
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - script/build/test_slice_tests.sh 3
     - RAILS_ENV=test rake db:create
@@ -311,8 +298,6 @@ job_integration_autowizard_chrome:
   tags:
     - browser-chrome
   script:
-    - export BROWSER_PORT=4001
-    - export WS_PORT=4002
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_example.json auto_wizard.json
@@ -327,8 +312,6 @@ job_integration_browser_chrome_1:
   tags:
     - browser-chrome
   script:
-    - export BROWSER_PORT=4011
-    - export WS_PORT=4012
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
@@ -347,8 +330,6 @@ job_integration_browser_chrome_2:
   tags:
     - browser-chrome
   script:
-    - export BROWSER_PORT=4021
-    - export WS_PORT=4022
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
@@ -367,8 +348,6 @@ job_integration_browser_chrome_3:
   tags:
     - browser-chrome
   script:
-    - export BROWSER_PORT=4031
-    - export WS_PORT=4032
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
@@ -388,8 +367,6 @@ job_integration_twitter_chrome:
     - browser-chrome
     - twitter
   script:
-    - export BROWSER_PORT=4041
-    - export WS_PORT=4042
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
@@ -405,8 +382,6 @@ job_integration_facebook_chrome:
     - browser-chrome
     - facebook
   script:
-    - export BROWSER_PORT=4051
-    - export WS_PORT=4052
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
@@ -421,8 +396,6 @@ job_integration_otrs_chrome:
   tags:
     - browser-chrome
   script:
-    - export BROWSER_PORT=4061
-    - export WS_PORT=4062
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - script/bootstrap.sh