diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
| commit | bd497e352ebd279536ae11855871162e82a3f88c (patch) | |
| tree | 2241444d4be33e199d7011b872713071a8f8cd41 /.gitlab/ci/releases.gitlab-ci.yml | |
| parent | 0388886f9439fa93efea29a159522aec5643f7c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/releases.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/releases.gitlab-ci.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab/ci/releases.gitlab-ci.yml b/.gitlab/ci/releases.gitlab-ci.yml index 8ca4041e6be..0f6753aa274 100644 --- a/.gitlab/ci/releases.gitlab-ci.yml +++ b/.gitlab/ci/releases.gitlab-ci.yml @@ -1,4 +1,10 @@ ---- +.releases:rules:canonical-dot-com-gitlab-stable-branch-only: + rules: + - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAME == "gitlab-org/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/' + +.releases:rules:canonical-dot-com-security-gitlab-stable-branch-only: + rules: + - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAME == "gitlab-org/security/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/' # Syncs any changes pushed to a stable branch to the corresponding # gitlab-foss/CE stable branch. We run this prior to any tests so that random @@ -10,27 +16,21 @@ stage: sync before_script: - apk add --no-cache --update curl bash jq - after_script: [] script: - bash scripts/sync-stable-branch.sh - only: - variables: - - $CI_SERVER_HOST == "gitlab.com" sync-stable-branch: - extends: .merge-train-sync + extends: + - .releases:rules:canonical-dot-com-gitlab-stable-branch-only + - .merge-train-sync variables: SOURCE_PROJECT: gitlab-org/gitlab TARGET_PROJECT: gitlab-org/gitlab-foss - only: - refs: - - /^[\d-]+-stable-ee$/@gitlab-org/gitlab sync-security-branch: - extends: .merge-train-sync + extends: + - .releases:rules:canonical-dot-com-security-gitlab-stable-branch-only + - .merge-train-sync variables: SOURCE_PROJECT: gitlab-org/security/gitlab TARGET_PROJECT: gitlab-org/security/gitlab-foss - only: - refs: - - /^[\d-]+-stable-ee$/@gitlab-org/security/gitlab |