From 336d79fbf9715839d7f969f00d51632282b91fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 26 Apr 2017 18:54:48 +0200
Subject: [PATCH] Group static-analysis jobs into a single job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml      | 46 +++++++++++++++------------------------------
 scripts/lint-doc.sh |  1 -
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ddc2c5f2542..114b22ef6c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -253,38 +253,40 @@ spinach mysql 9 10: *spinach-knapsack-mysql
     SETUP_DB: "false"
     USE_BUNDLE_INSTALL: "true"
 
-.exec: &exec
+.rake-exec: &rake-exec
   <<: *ruby-static-analysis
   <<: *dedicated-runner
   <<: *except-docs
   stage: test
   script:
-    - bundle exec $CI_JOB_NAME
+    - bundle exec rake $CI_JOB_NAME
 
-rubocop:
+static-analysis:
   <<: *ruby-static-analysis
   <<: *dedicated-runner
   <<: *except-docs
   stage: test
   script:
+    - bundle exec rake config_lint
+    - bundle exec rake flay
+    - bundle exec rake haml_lint
+    - bundle exec rake scss_lint
+    - bundle exec rake brakeman
+    - bundle exec license_finder
+    - scripts/lint-doc.sh
+    - yarn run eslint
     - bundle exec "rubocop --require rubocop-rspec"
 
-rake haml_lint: *exec
-rake scss_lint: *exec
-rake config_lint: *exec
-rake brakeman: *exec
-rake flay: *exec
-license_finder: *exec
-rake downtime_check:
-  <<: *exec
+downtime_check:
+  <<: *rake-exec
   except:
     - master
     - tags
     - /^[\d-]+-stable(-ee)?$/
     - /^docs\/*/
 
-rake ee_compat_check:
-  <<: *exec
+ee_compat_check:
+  <<: *rake-exec
   only:
     - branches@gitlab-org/gitlab-ce
   except:
@@ -402,16 +404,6 @@ rake karma:
     paths:
     - coverage-javascript/
 
-docs:check:apilint:
-  image: "phusion/baseimage"
-  stage: test
-  <<: *dedicated-runner
-  cache: {}
-  dependencies: []
-  before_script: []
-  script:
-    - scripts/lint-doc.sh
-
 docs:check:links:
   image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
   stage: test
@@ -485,14 +477,6 @@ coverage:
     - coverage/index.html
     - coverage/assets/
 
-lint:javascript:
-  <<: *dedicated-runner
-  <<: *except-docs
-  stage: test
-  before_script: []
-  script:
-    - yarn run eslint
-
 lint:javascript:report:
   <<: *dedicated-runner
   <<: *except-docs
diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh
index 62236ed539a..54c1ef3dfdd 100755
--- a/scripts/lint-doc.sh
+++ b/scripts/lint-doc.sh
@@ -21,4 +21,3 @@ fi
 
 echo "✔ Linting passed"
 exit 0
-