From b632066ca76cbbf29d8442a5cc058110af4ef768 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 18 Feb 2019 23:57:50 +0100
Subject: [PATCH] gitlab-ci: only run the reliable emulators on merge requests

---
 .gitlab-ci.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0e1f14f0..a06d37a41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,9 +107,9 @@ connected 22 default armeabi-v7a:
   tags:
     - fdroid
     - kvm
+  allow_failure: true
   only:
-    - merge_requests
-    - branches@fdroid/fdroidclient
+    - branches@eighthave/fdroidclient
   <<: *test-template
   <<: *connected-template
 
@@ -118,27 +118,21 @@ connected 17 default x86:
 
 connected 18 default x86:
   <<: *kvm-template
-  only:
-    - master@fdroid/fdroidclient
 
 connected 23 default x86:
   <<: *kvm-template
-  allow_failure: true
-  only:
-    - master@fdroid/fdroidclient
 
 connected 25 default x86:
   <<: *kvm-template
+  allow_failure: false
+  only:
+    - merge_requests
 
 connected 26 google_apis x86:
   <<: *kvm-template
-  only:
-    - master@fdroid/fdroidclient
 
 connected 27 google_apis_playstore x86:
   <<: *kvm-template
-  only:
-    - master@fdroid/fdroidclient
 
 connected 28 default x86_64:
   <<: *kvm-template