From 8eb29056cb53df54586d3e645ce3d32c9dd06d84 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 24 Feb 2016 18:49:14 +0100 Subject: testing script --- .gitlab-ci.yml | 291 ++------------------------------------------------------- 1 file changed, 6 insertions(+), 285 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 498c7447ede..03568db2089 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,96 +28,6 @@ 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: @@ -126,202 +36,13 @@ 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 "#builds" "Build failed for master/tags!" - 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 + - if [[ "$(basename „$PWD")" == "gitlab-ce" ]]; then + ./scripts/notify_slack.sh "#ci-test" "Build failed! Check https://gitlab.com/gitlab-org/gitlab-ee/commit/$CI_BUILD_REF/builds" + else + ./scripts/notify_slack.sh "#ci-test" "Build failed! Check https://gitlab.com/gitlab-org/gitlab-ee/commit/$CI_BUILD_REF/builds" + fi + when: on_failure \ No newline at end of file -- cgit v1.2.1 From c2d0671495c595815faaafb2a96a823df101dfe0 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 24 Feb 2016 18:58:39 +0100 Subject: make build fail --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 95ad88c76ae..c6491ca721c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -42,7 +42,7 @@ require 'carrierwave/orm/activerecord' require 'file_size_validator' -class Project < ActiveRecord::Base +clas Project < ActiveRecord::Base include Gitlab::ConfigHelper include Gitlab::ShellAdapter include Gitlab::VisibilityLevel -- cgit v1.2.1 From 1df2c1b2e73d19498653d3fce6b4464c70ca9772 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 24 Feb 2016 22:28:32 +0100 Subject: test --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03568db2089..65b0478e7cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,9 +40,5 @@ rubocop: notify:slack: stage: notifications script: - - if [[ "$(basename „$PWD")" == "gitlab-ce" ]]; then - ./scripts/notify_slack.sh "#ci-test" "Build failed! Check https://gitlab.com/gitlab-org/gitlab-ee/commit/$CI_BUILD_REF/builds" - else - ./scripts/notify_slack.sh "#ci-test" "Build failed! Check https://gitlab.com/gitlab-org/gitlab-ee/commit/$CI_BUILD_REF/builds" - fi + - ./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 -- cgit v1.2.1 From 6466e330c921c92526b2a505af155d9f3e05a0c7 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 24 Feb 2016 22:53:13 +0100 Subject: updated gitlab-ci script to include builds URL --- .gitlab-ci.yml | 287 +++++++++++++++++++++++++++++++++++++++++++++++++- app/models/project.rb | 2 +- 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 -- cgit v1.2.1 From dd533abc59b3ad343c00a46451157bc88e401ced Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 24 Feb 2016 23:05:35 +0100 Subject: gemfile random update --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7a1b94cff6c..c48c733f5a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -960,8 +960,8 @@ DEPENDENCIES mysql2 (~> 0.3.16) nested_form (~> 0.3.2) net-ssh (~> 3.0.1) - nokogiri (~> 1.6.7, >= 1.6.7.2) newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) octokit (~> 3.8.0) -- cgit v1.2.1 From cc934128f9662f944b26ad373e80a20ab5a8192a Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 25 Feb 2016 08:00:02 +0000 Subject: Update URL syntax --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b6ba29900c..bc5ac6bda18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,7 +318,7 @@ spinach:other:ruby22: notify:slack: stage: notifications script: - - ./scripts/notify_slack.sh "#builds" "Build failed! Check https://gitlab.com/gitlab-org/$(basename „$PWD)/commit/$CI_BUILD_REF/builds" + - ./scripts/notify_slack.sh "#builds" "Build failed! Check " when: on_failure only: - master@gitlab-org/gitlab-ce -- cgit v1.2.1 From 7eacb70c15548957ebbf2719824e1361a0098e10 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 26 Feb 2016 11:20:39 +0100 Subject: update gitlab-ci script syntax --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b6ba29900c..2c06d72aeb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,7 +318,7 @@ spinach:other:ruby22: notify:slack: stage: notifications script: - - ./scripts/notify_slack.sh "#builds" "Build failed! Check https://gitlab.com/gitlab-org/$(basename „$PWD)/commit/$CI_BUILD_REF/builds" + - ./scripts/notify_slack.sh "#builds" "Build on \`$CI_BUILD_REF_NAME\` failed! Check https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_BUILD_REF"/builds" when: on_failure only: - master@gitlab-org/gitlab-ce -- cgit v1.2.1 From cc42867612322f719585a3de2b9ce12c040ce54e Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 26 Feb 2016 11:22:34 +0100 Subject: update gitlab-ci script syntax --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc5ac6bda18..4e98b7a68ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,7 +318,7 @@ spinach:other:ruby22: notify:slack: stage: notifications script: - - ./scripts/notify_slack.sh "#builds" "Build failed! Check " + - ./scripts/notify_slack.sh "#builds" "Build on \`$CI_BUILD_REF_NAME\` failed! Check " when: on_failure only: - master@gitlab-org/gitlab-ce -- cgit v1.2.1