summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-03-30 14:12:37 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-03-30 14:12:37 +0000
commit3bfc8761a8cbe834c5db854d24eed83cfb71fcac (patch)
treedd2803f68ea64313e1da4aaa75abd7f59a2a54cd
parent4d61672506be65ac0ec33341c0a6e9645d399311 (diff)
parent7279b40c9f1521bae56998e2784ad73fcc4b6eae (diff)
downloadgitlab-ce-3bfc8761a8cbe834c5db854d24eed83cfb71fcac.tar.gz
Merge branch 'rc/checkout-false-in-package-and-qa' into 'master'
Don't let the Runner clone/fetch prior to the package-and-qa job See merge request gitlab-org/gitlab-ce!18102
-rw-r--r--.gitlab-ci.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70f41e4dc98..4890738aa3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -264,8 +264,17 @@ package-and-qa:
stage: build
cache: {}
when: manual
+ variables:
+ GIT_STRATEGY: none
+ before_script:
+ # We need to download the script rather than clone the repo since the
+ # package-and-qa job will not be able to run when the branch gets
+ # deleted (when merging the MR).
+ - apk add --update openssl
+ - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/$CI_COMMIT_SHA/scripts/trigger-build-omnibus
+ - chmod 755 trigger-build-omnibus
script:
- - scripts/trigger-build-omnibus
+ - ./trigger-build-omnibus
only:
- //@gitlab-org/gitlab-ce
- //@gitlab-org/gitlab-ee