From 25016fdb2f1a3e84f634e2c15ab0e40a80d327d1 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 20 Jul 2018 12:26:33 +0200
Subject: [PATCH] gitlab-ci: switch to 24 emulator to get some useful results

The emulator support seems to have totally melted down, so this is a step
back towards the old working setup.
---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09eeaf944..605135467 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,8 +70,7 @@ errorprone:
     - ./gradlew connectedCheck || (adb -e logcat -d '*:E' > logcat.txt; exit 1)
 
 connected24:
-  only:
-    - fdroid/fdroidclient@master
+  retry: 1
   <<: *test-template
   variables:
     AVD_SDK: "24"
@@ -79,10 +78,6 @@ connected24:
     AVD_PACKAGE: "system-images;android-${AVD_SDK};${AVD_TAG};armeabi-v7a"
   <<: *connected-template
 
-connected25:
-  <<: *test-template
-  <<: *connected-template
-
 deploy_nightly:
   stage: deploy
   only: