From 88e749c709040ab1b7ffd6b3a19c48aee17c6de6 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Jan 10 2018 13:05:50 +0000
Subject: Merge branch 'no_upstream_formulas_in_production' into 'production'


do not run the tests against upstream formulas in production

See merge request infra/salt!132
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6942b0..8f60fd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,8 @@ test_show_highstate_against_upstream_formulas:
     - bin/get_formulas.py -c -d /srv/formula -s
   script: bin/test_show_highstate.sh
   allow_failure: true
+  except:
+    - production@infra/salt
   tags:
     - docker