Merge branch '60819_yamllint_gitlabci' into 'master'

60819 yamllint gitlabci

See merge request gitlab-org/gitlab-ce!29124

.gitlab-ci.yml

@@ -44,3 +44,4 @@ include:
   - local: .gitlab/ci/review.gitlab-ci.yml
   - local: .gitlab/ci/setup.gitlab-ci.yml
   - local: .gitlab/ci/test-metadata.gitlab-ci.yml
+  - local: .gitlab/ci/yaml.gitlab-ci.yml

.gitlab/ci/pages.gitlab-ci.yml

-
 pages:
   extends: .dedicated-no-docs-no-db-pull-cache-job
   before_script: []

.gitlab/ci/yaml.gitlab-ci.yml

+# Yamllint of *.yml for .gitlab-ci.yml.
+# This uses rules from project root `.yamllint`.
+lint-ci-gitlab:
+  extends: .dedicated-runner
+  before_script: []
+  dependencies: []
+  image: sdesbure/yamllint:latest
+  script:
+    - yamllint .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates

.yamllint

+---
+
+extends: default
+
+rules:
+  line-length: disable
+  document-start: disable

changelogs/unreleased/60819_yamllint_gitlabci.yml

+---
+title: Fix yaml linting for GitLab CI inside project (.gitlab/ci) *.yml files and CI template files
+merge_request: 27576
+author: Will Hall
+type: fixed

lib/gitlab/ci/templates/.yamllint

+extends: default
+
+rules:
+  line-length: disable
+  document-start: disable

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

@@ -36,7 +36,7 @@ chefspec:
     - chef exec rspec spec
 
 # Set up your test matrix here. Example:
-#verify-centos-6:
+# verify-centos-6:
 #   stage: functional
 #   before_script:
 #     - apt-get update
@@ -44,7 +44,7 @@ chefspec:
 #   script:
 #     - kitchen verify default-centos-6 --destroy=always
 #
-#verify-centos-7:
+# verify-centos-7:
 #   stage: functional
 #   before_script:
 #     - apt-get update

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

@@ -8,7 +8,7 @@ before_script:
   # If you need to install any external applications, like a
   # postgres client, you may want to uncomment the line below:
   #
-  #- apt-get update -y
+  # - apt-get update -y
   #
   # Retrieve project dependencies
   # Do this on before_script since it'll be shared between both test and

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

@@ -22,15 +22,15 @@ before_script:
   - source /root/.sdkman/bin/sdkman-init.sh
   - sdk install gradle $GRADLE_VERSION < /dev/null
   - sdk use gradle $GRADLE_VERSION
-# As it's not a good idea to version gradle.properties feel free to add your
-# environments variable here
+  # As it's not a good idea to version gradle.properties feel free to add your
+  # environments variable here
   - echo grailsVersion=$GRAILS_VERSION > gradle.properties
   - echo gradleWrapperVersion=2.14 >> gradle.properties
-# refresh dependencies from your project
+  # refresh dependencies from your project
   - ./gradlew --refresh-dependencies
-# Be aware that if you are using Angular profile,
-# Bower cannot be run as root if you don't allow it before.
-# Feel free to remove next line if you are not using Bower
+  # Be aware that if you are using Angular profile,
+  # Bower cannot be run as root if you don't allow it before.
+  # Feel free to remove next line if you are not using Bower
   - echo {\"allow_root\":true} > /root/.bowerrc
 
 # This build job does the full grails pipeline

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

@@ -66,7 +66,6 @@ pages:
   only:
     - master
 
-
 # WARNING: This template is using the `julia` images from [Docker
 # Hub][3]. One can use custom Julia images and/or the official ones found
 # in the same place. However, care must be taken to correctly locate the binary

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

@@ -7,16 +7,16 @@ cache:
     - vendor/
 
 before_script:
-- apt-get update -yqq
-- apt-get install -yqq git libmcrypt-dev libpq-dev libcurl4-gnutls-dev libicu-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 libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev
-# Install PHP extensions
-- docker-php-ext-install mbstring mcrypt pdo_pgsql curl json intl gd xml zip bz2 opcache
-# Install & enable Xdebug for code coverage reports
-- pecl install xdebug
-- docker-php-ext-enable xdebug
-# Install and run Composer
-- curl -sS https://getcomposer.org/installer | php
-- php composer.phar install
+  - apt-get update -yqq
+  - apt-get install -yqq git libmcrypt-dev libpq-dev libcurl4-gnutls-dev libicu-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 libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev
+  # Install PHP extensions
+  - docker-php-ext-install mbstring mcrypt pdo_pgsql curl json intl gd xml zip bz2 opcache
+  # Install & enable Xdebug for code coverage reports
+  - pecl install xdebug
+  - docker-php-ext-enable xdebug
+  # Install and run Composer
+  - curl -sS https://getcomposer.org/installer | php
+  - php composer.phar install
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ce/ci/services/README.html for examples.

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

@@ -6,7 +6,7 @@ variables:
   JEKYLL_ENV: production
 
 before_script:
-- bundle install
+  - bundle install
 
 test:
   stage: test
@@ -27,4 +27,3 @@ pages:
       - public
   only:
     - master
-

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

@@ -5,16 +5,16 @@ image: "rust:latest"
 # Optional: Pick zero or more services to be used on all builds.
 # Only needed when using a docker container to run your tests in.
 # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service
-#services:
+# services:
 #   - mysql:latest
 #   - redis:latest
 #   - postgres:latest
 
 # Optional: Install a C compiler, cmake and git into the container.
 # You will often need this when you (or any of your dependencies) depends on C code.
-#before_script:
-#- apt-get update -yqq
-#- apt-get install -yqq --no-install-recommends build-essential
+# before_script:
+#   - apt-get update -yqq
+#   - apt-get install -yqq --no-install-recommends build-essential
 
 # Use cargo to test the project
 test:cargo:

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

-# This is a simple example illustrating how to build and test .NET Core project
+---
+# This is a simple example illustrating how to build and test .NET Core project
 # with GitLab Continuous Integration / Continuous Delivery.
 
 # ### Specify the Docker image

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

@@ -79,7 +79,6 @@ deploy_job:
     - 'xcopy /y ".\$env:EXE_RELEASE_FOLDER\YourApp.exe" "$deployFolder"'
     - 'xcopy /y ".\$env:MSI_RELEASE_FOLDER\YourApp Setup.msi" "$deployFolder"'
     - 'xcopy /y ".\TestResult.xml" "$deployFolder"'
-
   dependencies:
     - build_job
     - test_job