summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-02-24 22:53:13 +0100
committerJames Lopez <james@jameslopez.es>2016-02-24 22:53:13 +0100
commit6466e330c921c92526b2a505af155d9f3e05a0c7 (patch)
tree30a1195420e2ea08d5c738c21345b7eb72372983
parent1df2c1b2e73d19498653d3fce6b4464c70ca9772 (diff)
downloadgitlab-ce-6466e330c921c92526b2a505af155d9f3e05a0c7.tar.gz
updated gitlab-ci script to include builds URL
-rw-r--r--.gitlab-ci.yml287
-rw-r--r--app/models/project.rb2
2 files changed, 286 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65b0478e7cc..3b6ba29900c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,96 @@ stages:
- test
- notifications
+spec:feature:
+ stage: test
+ script:
+ - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+ tags:
+ - ruby
+ - mysql
+
+spec:api:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+ tags:
+ - ruby
+ - mysql
+
+spec:models:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+ tags:
+ - ruby
+ - mysql
+
+spec:lib:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+ tags:
+ - ruby
+ - mysql
+
+spec:services:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+ tags:
+ - ruby
+ - mysql
+
+spec:benchmark:
+ stage: test
+ script:
+ - RAILS_ENV=test bundle exec rake spec:benchmark
+ tags:
+ - ruby
+ - mysql
+ allow_failure: true
+
+spec:other:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+ tags:
+ - ruby
+ - mysql
+
+spinach:project:half:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+ tags:
+ - ruby
+ - mysql
+
+spinach:project:rest:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+ tags:
+ - ruby
+ - mysql
+
+spinach:other:
+ stage: test
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+ tags:
+ - ruby
+ - mysql
+
+teaspoon:
+ stage: test
+ script:
+ - RAILS_ENV=test bundle exec teaspoon
+ tags:
+ - ruby
+ - mysql
+
rubocop:
stage: test
script:
@@ -36,9 +126,202 @@ rubocop:
- ruby
- mysql
+brakeman:
+ stage: test
+ script:
+ - bundle exec rake brakeman
+ tags:
+ - ruby
+ - mysql
+
+flog:
+ stage: test
+ script:
+ - bundle exec rake flog
+ tags:
+ - ruby
+ - mysql
+
+flay:
+ stage: test
+ script:
+ - bundle exec rake flay
+ tags:
+ - ruby
+ - mysql
+
+bundler:audit:
+ stage: test
+ script:
+ - "bundle exec bundle-audit update"
+ - "bundle exec bundle-audit check"
+ tags:
+ - ruby
+ - mysql
+ allow_failure: true
+
+# Ruby 2.2 jobs
+
+spec:feature:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spec:api:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spec:models:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spec:lib:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spec:services:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spec:benchmark:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test bundle exec rake spec:benchmark
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+ allow_failure: true
+
+spec:other:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spinach:project:half:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spinach:project:rest:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
+spinach:other:ruby22:
+ stage: test
+ image: ruby:2.2
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+ cache:
+ key: "ruby22"
+ paths:
+ - vendor
+ tags:
+ - ruby
+ - mysql
+
notify:slack:
stage: notifications
script:
- - ./scripts/notify_slack.sh "#ci-test" "Build failed! Check https://gitlab.com/gitlab-org/$(basename „$PWD)/commit/$CI_BUILD_REF/builds"
- when: on_failure \ No newline at end of file
+ - ./scripts/notify_slack.sh "#builds" "Build failed! Check https://gitlab.com/gitlab-org/$(basename „$PWD)/commit/$CI_BUILD_REF/builds"
+ when: on_failure
+ only:
+ - master@gitlab-org/gitlab-ce
+ - tags@gitlab-org/gitlab-ce
+ - master@gitlab-org/gitlab-ee
+ - tags@gitlab-org/gitlab-ee \ No newline at end of file
diff --git a/app/models/project.rb b/app/models/project.rb
index c6491ca721c..95ad88c76ae 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -42,7 +42,7 @@
require 'carrierwave/orm/activerecord'
require 'file_size_validator'
-clas Project < ActiveRecord::Base
+class Project < ActiveRecord::Base
include Gitlab::ConfigHelper
include Gitlab::ShellAdapter
include Gitlab::VisibilityLevel