diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 12:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 12:09:00 +0000 |
| commit | 88a0824944720b6edaaef56376713541b9a02118 (patch) | |
| tree | f5fcc4f9755f249779cda9a8f02902d734af6e7e /.gitlab/ci | |
| parent | 7d19df2d34a9803d9f077c16315ba919b7ae2aa2 (diff) | |
| download | gitlab-ce-88a0824944720b6edaaef56376713541b9a02118.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/cache-repo.gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .gitlab/ci/cng.gitlab-ci.yml | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/.gitlab/ci/cache-repo.gitlab-ci.yml b/.gitlab/ci/cache-repo.gitlab-ci.yml index 1162e98e246..9dcb6f40589 100644 --- a/.gitlab/ci/cache-repo.gitlab-ci.yml +++ b/.gitlab/ci/cache-repo.gitlab-ci.yml @@ -1,3 +1,7 @@ +# Make sure to update all the similar conditions in other CI config files if you modify these conditions +.if-cache-credentials-schedule: &if-cache-credentials-schedule + if: '$CI_REPO_CACHE_CREDENTIALS && $CI_PIPELINE_SOURCE == "schedule"' + # Builds a cached .tar.gz of the master branch with full history and # uploads it to Google Cloud Storage. This archive is downloaded by a # script defined by a CI/CD variable named CI_PRE_CLONE_SCRIPT. This has @@ -33,8 +37,6 @@ cache-repo: - tar cf $TAR_FILENAME . - gzip $TAR_FILENAME - gsutil cp $TAR_FILENAME.gz gs://gitlab-ci-git-repo-cache/project-$CI_PROJECT_ID/gitlab-master.tar.gz - only: - variables: - - $CI_REPO_CACHE_CREDENTIALS - refs: - - schedules + rules: + - <<: *if-cache-credentials-schedule + when: on_success diff --git a/.gitlab/ci/cng.gitlab-ci.yml b/.gitlab/ci/cng.gitlab-ci.yml index bd11042eb11..96ffd3941ab 100644 --- a/.gitlab/ci/cng.gitlab-ci.yml +++ b/.gitlab/ci/cng.gitlab-ci.yml @@ -1,15 +1,17 @@ +# Make sure to update all the similar conditions in other CI config files if you modify these conditions +.if-canonical-gitlab-tag: &if-canonical-gitlab-tag + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_COMMIT_TAG' + cloud-native-image: - extends: .only:variables-canonical-dot-com image: ruby:2.6-alpine dependencies: [] stage: post-test allow_failure: true variables: GIT_DEPTH: "1" - when: manual script: - install_gitlab_gem - CNG_PROJECT_PATH="gitlab-org/build/CNG" BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN ./scripts/trigger-build cng - only: - refs: - - tags + rules: + - <<: *if-canonical-gitlab-tag + when: manual |