From 76f201bb2f63112402fa1a098669d8117be2c3b6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 24 Mar 2021 16:06:48 -0300
Subject: [PATCH] Run Espresso tests manually as they are still too flaky

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 017bd130f..76ecc8a15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
   - check_reproducibility
 
 .base-test:
-  stage: test
   before_script:
     - set -e
     - export GRADLE_USER_HOME=$PWD/.gradle
@@ -22,12 +21,14 @@ stages:
 
 test:
   extends: .base-test
+  stage: test
   script:
     - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
     - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom check
 
 android test:
   extends: .base-test
+  stage: optional_tests
   image: briar/ci-image-android-emulator:latest
   script:
     # start emulator first, so it can fail early
@@ -41,12 +42,9 @@ android test:
       - logcat.txt
     expire_in: 3 days
     when: on_failure
-  only:
-    refs:
-      - merge_requests
-      - branches
-    changes:
-      - briar-android/**/*
+  when: manual
+  except:
+    - tags
   tags:
     - kvm