From 07c5d3d0e20b6b9895e46a576e1d0a9bfa68adfe Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Mon, 19 Dec 2016 13:43:04 +0100
Subject: [PATCH] Allow triggered gitlab CI builds

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 .gitlab-ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac5e63394..86793ee38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,6 +141,7 @@ coreos-calico-sep:
     CLUSTER_MODE: separated
     BOOTSTRAP_OS: coreos
   when: on_success
+  except: ['triggers']
   only: [/^pr-.*$/]
 
 debian8-canal-ha:
@@ -154,7 +155,7 @@ debian8-canal-ha:
     CLOUD_REGION: us-east1-b
     CLUSTER_MODE: ha
   when: manual
-  only: ['master', /^pr-.*$/]
+  only: ['master', /^pr-.*$/, 'triggers']
 
 rhel7-weave:
   stage: deploy-gce-part1
@@ -167,7 +168,7 @@ rhel7-weave:
     CLOUD_REGION: europe-west1-b
     CLUSTER_MODE: default
   when: manual
-  only: ['master', /^pr-.*$/]
+  only: ['master', /^pr-.*$/, 'triggers']
 
 centos7-flannel:
   stage: deploy-gce-part2
@@ -180,6 +181,7 @@ centos7-flannel:
     CLOUD_REGION: us-west1-a
     CLUSTER_MODE: default
   when: on_success
+  except: ['triggers']
   only: [/^pr-.*$/]
 
 debian8-calico:
@@ -193,7 +195,7 @@ debian8-calico:
     CLOUD_REGION: us-central1-b
     CLUSTER_MODE: default
   when: manual
-  only: ['master', /^pr-.*$/]
+  only: ['master', /^pr-.*$/, 'triggers']
 
 coreos-canal:
   stage: deploy-gce-part2
@@ -207,7 +209,7 @@ coreos-canal:
     CLUSTER_MODE: default
     BOOTSTRAP_OS: coreos
   when: manual
-  only: ['master', /^pr-.*$/]
+  only: ['master', /^pr-.*$/, 'triggers']
 
 rhel7-canal-sep:
   stage: deploy-gce-special
@@ -220,7 +222,7 @@ rhel7-canal-sep:
     CLOUD_REGION: us-east1-b
     CLUSTER_MODE: separated
   when: manual
-  only: ['master', /^pr-.*$/]
+  only: ['master', /^pr-.*$/, 'triggers']
 
 ubuntu-weave-sep:
   stage: deploy-gce-special
@@ -233,6 +235,7 @@ ubuntu-weave-sep:
     CLOUD_REGION: us-central1-b
     CLUSTER_MODE: separated
   when: on_success
+  except: ['triggers']
   only: [/^pr-.*$/]
 
 centos7-calico-ha:
@@ -246,10 +249,11 @@ centos7-calico-ha:
     CLOUD_REGION: europe-west1-b
     CLUSTER_MODE: ha
   when: manual
-  only: ['master', /^pr-.*$/]
+  only: ['master', /^pr-.*$/, 'triggers']
 
 syntax-check:
   <<: *job
   stage: unit-tests
   script:
     - ansible-playbook -i inventory/local-tests.cfg -u root -e ansible_ssh_user=root  -b --become-user=root cluster.yml -vvv  --syntax-check
+  except: ['triggers']