Browse Source

Set correct job order.

Martin Edenhofer 8 years ago
parent
commit
0d415ec989
1 changed files with 16 additions and 16 deletions
  1. 16 16
      .gitlab-ci.yml

+ 16 - 16
.gitlab-ci.yml

@@ -164,22 +164,6 @@ test:integration:user_device:
     - ruby -I test/ test/integration/user_device_controller_test.rb
     - ruby -I test/ test/integration/user_device_controller_test.rb
     - rake db:drop
     - rake db:drop
 
 
-test:integration:api_client_ruby:
-  stage: test
-  dependencies:
-    - browser:build
-  tags:
-    - browser
-  script:
-    - RAILS_ENV=test rake db:create
-    - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - git clone git@github.com:martini/zammad_api_client_ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - cd zammad_api_client_ruby
-    - export TEST_URL=http://$IP:$BROWSER_PORT
-    - rspec spec/zammad_api_spec.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
-
 test:integration:slack:
 test:integration:slack:
   stage: test
   stage: test
   tags:
   tags:
@@ -362,6 +346,22 @@ browser:build:
     - public/assets/application-*
     - public/assets/application-*
     - public/assets/print-*
     - public/assets/print-*
 
 
+test:integration:api_client_ruby:
+  stage: test
+  dependencies:
+    - browser:build
+  tags:
+    - browser
+  script:
+    - RAILS_ENV=test rake db:create
+    - cp contrib/auto_wizard_test.json auto_wizard.json
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
+    - git clone git@github.com:martini/zammad_api_client_ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - cd zammad_api_client_ruby
+    - export TEST_URL=http://$IP:$BROWSER_PORT
+    - rspec spec/zammad_api_spec.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - ../script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+
 test:browser:twitter_ff:
 test:browser:twitter_ff:
   stage: browser
   stage: browser
   dependencies:
   dependencies: