Verified Commit 4e17371c authored by Rémy Coutable's avatar Rémy Coutable 🔴
Browse files

Use merge request pipelines with change detection 



Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent e747d771

.gitlab/ci/docs.gitlab-ci.yml

+10 −15
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  extends:

    - .default-tags

    - .default-retry

    - .default-only

  image: ruby:2.6-alpine

  stage: review

  dependencies: []
@@ -25,33 +26,25 @@ 
review-docs-deploy-manual:

  extends:

    - .review-docs

    - .except-docs-qa

    - .only-code-changes

  when: manual

  script:

    - gem install gitlab --no-document

    - ./trigger-build-docs deploy

  when: manual

  only:

    - branches@gitlab-org/gitlab-ce

    - branches@gitlab-org/gitlab-ee



# Always trigger a docs build in gitlab-docs only on docs-only branches.

# Useful to preview the docs changes live.

review-docs-deploy:

  extends:

    - .review-docs

    - .except-qa

    - .only-docs-changes

  script:

    - gem install gitlab --no-document

    - ./trigger-build-docs deploy

  only:

    - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ce

    - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ee



# Cleanup remote environment of gitlab-docs

review-docs-cleanup:

  extends:

    - .review-docs

    - .except-qa

  extends: .review-docs

  environment:

    name: review-docs/$CI_COMMIT_REF_SLUG

    action: stop
@@ -60,14 +53,16 @@ review-docs-cleanup: 
    - ./trigger-build-docs cleanup

  when: manual

  only:

    - branches@gitlab-org/gitlab-ce

    - branches@gitlab-org/gitlab-ee

    variables:

      - $CI_PROJECT_PATH == "gitlab-org/gitlab-ce"

      - $CI_PROJECT_PATH == "gitlab-org/gitlab-ee"



docs lint:

  extends:

    - .default-tags

    - .default-retry

    - .except-qa

    - .default-only

    - .only-docs-changes

  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs-lint"

  stage: test

  dependencies: []

.gitlab/ci/frontend.gitlab-ci.yml

+24 −17
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ 
  extends:

    - .default-tags

    - .default-retry

    - .assets-compile-cache

    - .default-only

    - .default-before_script

    - .except-docs

    - .assets-compile-cache

    - .only-qa-changes

  image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-18.06.1

  dependencies: ["setup-test-env"]

  services:
@@ -47,10 +48,11 @@ 
    - play_job "review-build-cng" || true  # this job might not exist so ignore the failure if it cannot be played

    - play_job "schedule:review-build-cng" || true  # this job might not exist so ignore the failure if it cannot be played

  only:

    - /.+/@gitlab-org/gitlab-ce

    - /.+/@gitlab-org/gitlab-ee

    - /.+/@gitlab/gitlabhq

    - /.+/@gitlab/gitlab-ee

    variables:

      - $CI_PROJECT_PATH == "gitlab-org/gitlab-ce"

      - $CI_PROJECT_PATH == "gitlab-org/gitlab-ee"

      - $CI_PROJECT_PATH == "gitlab/gitlabhq"

      - $CI_PROJECT_PATH == "gitlab/gitlab-ee"

  tags:

    - gitlab-org

    - docker
@@ -70,7 +72,6 @@ gitlab:assets:compile pull-cache: 
    refs:

      - master@gitlab-org/gitlab-ce

      - master@gitlab-org/gitlab-ee

      - /(^docs[\/-].+|.+-docs$)/

  cache:

    policy: pull
@@ -78,8 +79,10 @@ gitlab:assets:compile pull-cache: 
  extends:

    - .default-tags

    - .default-retry

    - .assets-compile-cache

    - .default-only

    - .default-before_script

    - .assets-compile-cache

    - .only-code-changes

    - .use-pg

  stage: prepare

  script:
@@ -100,8 +103,7 @@ gitlab:assets:compile pull-cache: 
      - public/assets



compile-assets:

  extends:

    - .compile-assets-metadata

  extends: .compile-assets-metadata

  only:

    refs:

      - master@gitlab-org/gitlab-ce
@@ -115,7 +117,6 @@ compile-assets pull-cache: 
    refs:

      - master@gitlab-org/gitlab-ce

      - master@gitlab-org/gitlab-ee

      - /(^docs[\/-].+|.+-docs$)/

  cache:

    policy: pull
@@ -124,9 +125,10 @@ karma: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .default-only

    - .default-before_script

    - .only-code-changes

    - .use-pg

    - .except-docs

  dependencies: ["compile-assets", "compile-assets pull-cache", "setup-test-env"]

  variables:

    # we override the max_old_space_size to prevent OOM errors
@@ -154,9 +156,10 @@ jest: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .default-only

    - .default-before_script

    - .only-code-changes

    - .use-pg

    - .except-docs-qa

  dependencies: ["compile-assets", "compile-assets pull-cache", "setup-test-env"]

  script:

    - scripts/gitaly-test-spawn
@@ -185,7 +188,8 @@ jest: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .except-docs

    - .default-only

    - .only-code-changes

  dependencies: ["setup-test-env"]

  variables:

    SETUP_DB: "false"
@@ -208,7 +212,8 @@ qa:selectors: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .except-docs

    - .default-only

    - .only-code-changes

  dependencies: []

  cache:

    key: "$CI_JOB_NAME"
@@ -239,7 +244,8 @@ lint:javascript:report: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .except-docs

    - .default-only

    - .only-code-changes

  variables:

    SETUP_DB: "false"

  stage: post-test
@@ -258,7 +264,8 @@ jsdoc: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .except-docs

    - .default-only

    - .only-code-changes

  variables:

    SETUP_DB: "false"

  stage: post-test

.gitlab/ci/global.gitlab-ci.yml

+66 −23
Original line number Diff line number Diff line
@@ -27,40 +27,83 @@ 
      - vendor/gitaly-ruby

    policy: pull



.except-docs:

  except:

    refs:

      - /(^docs[\/-].+|.+-docs$)/



.except-qa:

  except:

.default-only:

  only:

    refs:

      - /(^qa[\/-].*|.*-qa$)/

      - master

      - /-stable/

      - /^\d+-\d+-auto-deploy-\d+$/

      - merge_requests

      - tags@gitlab-org/gitlab-ce

      - tags@gitlab-org/gitlab-ee

      - tags@gitlab/gitlabhq

      - tags@gitlab/gitlab-ee



.except-docs-qa:

  except:

    refs:

      - /(^docs[\/-].+|.+-docs$)/

      - /(^qa[\/-].*|.*-qa$)/

.only-code-changes:

  only:

    changes:

      - app/*

      - bin/*

      - config/*

      - db/*

      - ee/*

      - fixtures/*

      - lib/*

      - public/*

      - rubocop/*

      - spec/*

      - symbol/*

      - vendor/*

      - "*.{erb,haml,lock,js,json,rake,ru,png,rb,scss,svg,vue,yml}"

      - "**/*.{erb,haml,lock,js,json,rake,ru,png,rb,scss,svg,vue,yml}"

      - .gitlab/ci/*

      - .gitlab-ci.yml

      - "*_VERSION"

      - Gemfile

      - Rakefile



.except-docs-qa-geo:

  except:

    refs:

      - /(^docs[\/-].+|.+-docs$)/

      - /(^qa[\/-].*|.*-qa$)/

      - /(^geo[\/-].*|.*-geo$)/

.only-qa-changes:

  only:

    changes:

      - app/*

      - bin/*

      - config/*

      - db/*

      - ee/*

      - fixtures/*

      - lib/*

      - public/*

      - rubocop/*

      - spec/*

      - symbol/*

      - vendor/*

      - "*.{erb,haml,lock,js,json,rake,ru,png,rb,scss,svg,vue,yml}"

      - "**/*.{erb,haml,lock,js,json,rake,ru,png,rb,scss,svg,vue,yml}"

      - .gitlab/ci/*

      - .gitlab-ci.yml

      - "*_VERSION"

      - Gemfile

      - Rakefile

      - qa/*



.review-only:

.only-docs-changes:

  only:

    refs:

      - branches@gitlab-org/gitlab-ce

      - branches@gitlab-org/gitlab-ee

    changes:

      - doc/*

      - "*.{png,jpg,md}"

      - "**/*.{png,jpg,md}"



.review-only-except:

  only:

    variables:

      - $CI_PROJECT_PATH == "gitlab-org/gitlab-ce"

      - $CI_PROJECT_PATH == "gitlab-org/gitlab-ee"

    kubernetes: active

  except:

    refs:

      - master

      - /^\d+-\d+-auto-deploy-\d+$/

      - /(^docs[\/-].+|.+-docs$)/



.use-pg:

  services:

.gitlab/ci/memory.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ memory-static: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .default-only

    - .default-before_script

    - .except-docs

    - .only-code-changes

  variables:

    SETUP_DB: "false"

  script:
@@ -34,9 +35,10 @@ memory-on-boot: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .default-only

    - .default-before_script

    - .use-pg-10

    - .except-docs-qa

    - .only-code-changes

  variables:

    NODE_ENV: "production"

    RAILS_ENV: "production"

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

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ pages: 
    - .default-tags

    - .default-retry

    - .default-cache

    - .except-docs

    - .default-only

    - .only-code-changes

  only:

    refs:

      - master@gitlab-org/gitlab-ce