Automatic merge of gitlab-org/gitlab-ce master

.gitlab-ci.yml

 image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
 
+include:
+  - local: /lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml
+
 .dedicated-runner: &dedicated-runner
   retry: 1
   tags:
@@ -945,31 +948,14 @@ jest:
 
 code_quality:
   <<: *dedicated-no-docs-no-db-pull-cache-job
-  image: docker:stable
-  allow_failure: true
   # gitlab-org runners set `privileged: false` but we need to have it set to true
   # since we're using Docker in Docker
   tags: []
   before_script: []
-  services:
-    - docker:stable-dind
-  variables:
-    SETUP_DB: "false"
-    DOCKER_DRIVER: overlay2
   cache: {}
   dependencies: []
-  script:
-    # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    reports:
-      codequality: gl-code-quality-report.json
-    expire_in: 1 week
+  variables:
+    SETUP_DB: "false"
 
 sast:
   <<: *dedicated-no-docs-no-db-pull-cache-job

lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml

@@ -118,4 +118,3 @@ promoteProduction:
    - master
   script:
     - bundle exec fastlane promote_beta_to_production
-    
\ No newline at end of file

lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml

+code_quality:
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  variables:
+    DOCKER_DRIVER: overlay2
+  script:
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:11-8-stable" /code
+  artifacts:
+    reports:
+      codequality: gl-code-quality-report.json
+    expire_in: 1 week

lib/gitlab/ci/templates/Gradle.gitlab-ci.yml

@@ -23,7 +23,6 @@ build:
       - build
       - .gradle
 
-
 test:
   stage: test
   script: gradle check
@@ -33,4 +32,3 @@ test:
     paths:
       - build
       - .gradle
-

lib/gitlab/ci/templates/Laravel.gitlab-ci.yml

@@ -24,31 +24,23 @@ cache:
 before_script:
   # Update packages
   - apt-get update -yqq
-  
   # Prep for Node
   - apt-get install gnupg -yqq
-
   # Upgrade to Node 8
   - curl -sL https://deb.nodesource.com/setup_8.x | bash -
-
   # Install dependencies
   - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq
-
   # Install php extensions
   - docker-php-ext-install mbstring pdo_mysql curl json intl gd xml zip bz2 opcache
-
   # Install & enable Xdebug for code coverage reports
   - pecl install xdebug
   - docker-php-ext-enable xdebug
-
   # Install Composer and project dependencies.
   - curl -sS https://getcomposer.org/installer | php
   - php composer.phar install 
-
   # Install Node dependencies.
   # comment this out if you don't have a node dependency
   - npm install
-
   # Copy over testing configuration.
   # Don't forget to set the database config in .env.testing correctly
   # DB_HOST=mysql
@@ -56,20 +48,16 @@ before_script:
   # DB_USERNAME=root
   # DB_PASSWORD=secret
   - cp .env.testing .env
-
   # Run npm build
   # comment this out if you don't have a frontend build
   # you can change this to to your frontend building script like
   # npm run build
   - npm run dev
-
   # Generate an application key. Re-cache.
   - php artisan key:generate
   - php artisan config:cache
-
   # Run database migrations.
   - php artisan migrate
-
   # Run database seed
   - php artisan db:seed
 
@@ -77,7 +65,6 @@ test:
   script:
   # run laravel tests
   - php vendor/bin/phpunit --coverage-text --colors=never 
-
   # run frontend tests
   # if you have any task for testing frontend
   # set it in your package.json script

lib/gitlab/ci/templates/Maven.gitlab-ci.yml

@@ -66,7 +66,6 @@ verify:jdk8:
   <<: *verify
   image: maven:3.3.9-jdk-8
 
-
 # For `master` branch run `mvn deploy` automatically.
 # Here you need to decide whether you want to use JDK7 or 8.
 # To get this working you need to define a volume while configuring your gitlab-ci-multi-runner.
@@ -85,7 +84,6 @@ deploy:jdk8:
     - target/staging
   image: maven:3.3.9-jdk-8
 
-
 pages:
   image: busybox:latest
   stage: deploy

lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml

@@ -5,7 +5,6 @@ pages:
   cache:
     paths:
     - node_modules/
-
   script:
   - npm install -g brunch
   - brunch build --production

lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml

@@ -5,7 +5,6 @@ pages:
   cache:
     paths:
     - node_modules
-
   script:
   - npm install -g harp
   - harp compile ./ public

lib/gitlab/ci/templates/Pages/JBake.gitlab-ci.yml

@@ -13,7 +13,6 @@ image: java:8
 variables:
     JBAKE_VERSION: 2.5.1
 
-
 # We use SDKMan as tool for managing versions
 before_script:
    - apt-get update -qq && apt-get install -y -qq unzip zip

lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml

@@ -13,22 +13,17 @@ cache:
 before_script:
   # Update packages
   - apt-get update -yqq
-
   # Install dependencies
   - apt-get install -yqq gnupg zlib1g-dev libpng-dev
-  
   # Install Node 8
   - curl -sL https://deb.nodesource.com/setup_8.x | bash -
   - apt-get install -yqq nodejs
-
   # Install php extensions
   - docker-php-ext-install zip
-
-  # Install Composer and project dependencies.
+  # Install Composer and project dependencies
   - curl -sS https://getcomposer.org/installer | php
   - php composer.phar install
-  
-  # Install Node dependencies.
+  # Install Node dependencies
   - npm install
 
 pages:

lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml

@@ -5,7 +5,6 @@ pages:
   cache:
     paths:
     - node_modules/
-
   script:
   - npm install -g metalsmith
   - npm install

lib/gitlab/ci/templates/dotNET.gitlab-ci.yml

@@ -26,7 +26,6 @@ variables:
   MSI_RELEASE_FOLDER: 'Setup\bin\Release'
   TEST_FOLDER: 'Tests\bin\Release'
   DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds'
-  
   NUGET_PATH: 'C:\NuGet\nuget.exe'
   MSBUILD_PATH: 'C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe'
   NUNIT_PATH: 'C:\Program Files (x86)\NUnit.org\nunit-console\nunit3-console.exe'
@@ -84,4 +83,3 @@ deploy_job:
   dependencies:
     - build_job
     - test_job
-  
\ No newline at end of file