From 68ce52dfcabd93f0ec3e258803a09d8660dda399 Mon Sep 17 00:00:00 2001
From: Antoine Legrand <2t.antoine@gmail.com>
Date: Thu, 20 Jul 2017 15:15:20 +0200
Subject: [PATCH] Fix master ci-pipeline

---
 .gitlab-ci.jsonnet | 1 +
 .gitlab-ci.yml     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.gitlab-ci.jsonnet b/.gitlab-ci.jsonnet
index bbbd4d0e0..bbfc86835 100644
--- a/.gitlab-ci.jsonnet
+++ b/.gitlab-ci.jsonnet
@@ -26,6 +26,7 @@ local jobs = {
   },
   local onlyBranch = {
     only: ['branches'],
+    except: ['master']
   },
 
   'container-base-build': baseJob.dockerBuild + onlyMaster {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18d564264..08c320663 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,6 +58,8 @@ deploy-preview:
     name: review/${CI_COMMIT_REF_SLUG}
     on_stop: stop-preview
     url: https://quay-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
+  except:
+  - master
   image: quay.io/appr/appr:kubectl
   only:
   - branches
@@ -195,6 +197,8 @@ stop-preview:
     action: stop
     name: review/${CI_COMMIT_REF_SLUG}
     url: https://quay-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
+  except:
+  - master
   image: quay.io/appr/appr:kubectl
   only:
   - branches