summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-03-28 10:31:56 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-02 15:26:13 +0000
commitb7bc872ed830210ccc6188deb43913705c13ae81 (patch)
tree248d3cc4e8a4a62d753a1dafef1ba6532b44c231
parentd44e4d5748ccadc96216c82a3fb1522719a4a239 (diff)
downloadgitlab-ce-b7bc872ed830210ccc6188deb43913705c13ae81.tar.gz
Merge branch 'remove-cng-job' into 'master'
Remove cloud-native-job from CI See merge request gitlab-org/gitlab-ce!25605 (cherry picked from commit 04496085c1b83ccf5d9bfa546daf2a92e9c644e7) a1912444 Make cloud release job manual, as a fallback
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88bd4167265..f33e47a7234 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -315,7 +315,7 @@ cloud-native-image:
variables:
GIT_DEPTH: "1"
cache: {}
- when: always
+ when: manual
script:
- gem install gitlab --no-document
- CNG_PROJECT_PATH="gitlab-org/build/CNG" BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN ./scripts/trigger-build cng