From 13efa95ef709708e321e14fbf2905eab4c7648af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= <ak@patientsky.com>
Date: Thu, 3 Jan 2019 10:26:38 +0100
Subject: [PATCH] Run less CI jobs on each PR (#3967)
---
.gitlab-ci.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c155e0b9..1df68ec8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -364,6 +364,8 @@ gce_centos7-flannel-addons:
except: ['triggers']
only: [/^pr-.*$/]
+### MANUAL JOBS
+
gce_centos-weave-kubeadm-sep:
stage: deploy-part2
<<: *job
@@ -372,10 +374,7 @@ gce_centos-weave-kubeadm-sep:
<<: *gce_variables
<<: *centos_weave_kubeadm_variables
when: on_success
- except: ['triggers']
- only: [/^pr-.*$/]
-
-### MANUAL JOBS
+ only: ['triggers']
gce_ubuntu-weave-sep:
stage: deploy-part2
@@ -385,8 +384,7 @@ gce_ubuntu-weave-sep:
<<: *gce_variables
<<: *ubuntu_weave_sep_variables
when: manual
- except: ['triggers']
- only: [/^pr-.*$/]
+ only: ['triggers']
gce_coreos-calico-sep-triggers:
stage: deploy-part2
--
GitLab