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-23 10:07:36 +0000
commit8815322e95fc522f7763a8bce68d461cd62b30b8 (patch)
tree665650b0b90700c6f92986b171417a7ea6604539
parent7b7b5090bc6734a5e894fb2f52aa65dc216dcfcc (diff)
downloadgitlab-ce-8815322e95fc522f7763a8bce68d461cd62b30b8.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 45de5ce61c6..f85edcd74df 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