new syntax of .gitlab-ci.yml

1 files changed, 37 insertions, 25 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1411a9194b5..8fba268be7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+# This file is generated by GitLab CI
 before_script:
   - export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
   - ruby -v
@@ -7,33 +8,44 @@ before_script:
   - echo $PATH
   - cp config/database.yml.mysql config/database.yml
   - cp config/gitlab.yml.example config/gitlab.yml
-  - ! 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
-  - ! 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
+  - 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
+  - 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
   - sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml
   - touch log/application.log
   - touch log/test.log
   - bundle install --without postgres production --jobs $(nproc)
   - bundle exec rake db:create RAILS_ENV=test
-jobs:
-- script:
-  - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
-  name: Rspec
-  runner: ruby,mysql
-- script:
-  - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
-  name: Spinach
-  runner: ruby,mysql
-- script:
-  - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
-  name: Jasmine
-  runner: ruby,mysql
-- script:
-  - bundle exec rubocop
-  name: Rubocop
-  runner: ruby,mysql
-- script:
-  - bundle exec rake brakeman
-  name: Brakeman
-  runner: ruby,mysql
-deploy_jobs: []
-skip_refs: ''
+Rspec:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
+  tags:
+    - ruby
+    - mysql
+
+Spinach:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
+  tags:
+    - ruby
+    - mysql
+
+Jasmine:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
+  tags:
+    - ruby
+    - mysql
+
+Rubocop:
+  script:
+    - bundle exec rubocop
+  tags:
+    - ruby
+    - mysql
+
+Brakeman:
+  script:
+    - bundle exec rake brakeman
+  tags:
+    - ruby
+    - mysql
\ No newline at end of file