From e99564568b2fefab8973ce571594aaa888cf8494 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 31 Jul 2017 15:17:14 +0200
Subject: CI fixes for gitaly-ruby

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adde3400107..27fdf6ca0b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,6 +96,7 @@ stages:
     - export KNAPSACK_GENERATE_REPORT=true
     - export CACHE_CLASSES=true
     - cp ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
+    - scripts/gitaly-test-spawn
     - knapsack rspec "--color --format documentation"
   artifacts:
     expire_in: 31d
@@ -221,6 +222,7 @@ setup-test-env:
     - bundle exec rake gettext:po_to_json
     - bundle exec rake gitlab:assets:compile
     - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
+    - scripts/gitaly-test-build # Do not use 'bundle exec' here
   artifacts:
     expire_in: 7d
     paths:
@@ -486,6 +488,7 @@ karma:
     BABEL_ENV: "coverage"
     CHROME_LOG_FILE: "chrome_debug.log"
   script:
+    - scripts/gitaly-test-spawn
     - bundle exec rake gettext:po_to_json
     - bundle exec rake karma
   coverage: '/^Statements *: (\d+\.\d+%)/'
-- 
cgit v1.2.1


From ad838ea6aa38afda4f7d7e4249bd718f27a34c9b Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 4 Aug 2017 23:54:43 +0800
Subject: Since mysql is not a priority anymore, test it less

---
 .gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27fdf6ca0b5..f55bdc19eec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,16 +66,18 @@ stages:
     - mysql:latest
     - redis:alpine
 
-.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
+.only-if-want-mysql: &only-if-want-mysql
   only:
     - /mysql/
     - /-stable/
     - master@gitlab-org/gitlab-ce
+    - master@gitlab-org/gitlab-ee
     - master@gitlab/gitlabhq
+    - master@gitlab/gitlab-ee
     - tags@gitlab-org/gitlab-ce
+    - tags@gitlab-org/gitlab-ee
     - tags@gitlab/gitlabhq
-    - //@gitlab-org/gitlab-ee
-    - //@gitlab/gitlab-ee
+    - tags@gitlab/gitlab-ee
 
 # Skip all jobs except the ones that begin with 'docs/'.
 # Used for commits including ONLY documentation changes.
@@ -114,7 +116,7 @@ stages:
 .rspec-knapsack-mysql: &rspec-knapsack-mysql
   <<: *rspec-knapsack
   <<: *use-mysql
-  <<: *only-master-and-ee-or-mysql
+  <<: *only-if-want-mysql
   <<: *except-docs
 
 .spinach-knapsack: &spinach-knapsack
@@ -146,7 +148,7 @@ stages:
 .spinach-knapsack-mysql: &spinach-knapsack-mysql
   <<: *spinach-knapsack
   <<: *use-mysql
-  <<: *only-master-and-ee-or-mysql
+  <<: *only-if-want-mysql
   <<: *except-docs
 
 .only-canonical-masters: &only-canonical-masters
-- 
cgit v1.2.1


From 9770c57fab0315865a33c8b6df269eded0d57b5c Mon Sep 17 00:00:00 2001
From: Brian Neel <brian@gitlab.com>
Date: Thu, 3 Aug 2017 22:20:34 -0400
Subject: Re-enable SqlInjection and CommandInjection

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f55bdc19eec..e10958b3bee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -514,8 +514,11 @@ codeclimate:
   services:
     - docker:dind
   script:
+    - cp .rubocop.yml .rubocop.yml.bak
+    - grep -v "rubocop-gitlab-security" .rubocop.yml.bak > .rubocop.yml
     - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > raw_codeclimate.json
     - cat raw_codeclimate.json | docker run -i stedolan/jq -c 'map({check_name,fingerprint,location})' > codeclimate.json
+    - mv .rubocop.yml.bak .rubocop.yml
   artifacts:
     paths: [codeclimate.json]
 
-- 
cgit v1.2.1