From 09cfadbf7e37ef61a851894b26372e8970e994f8 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 29 Jan 2021 14:38:03 +0000
Subject: [PATCH 1/3] Add manual pipeline stage for running optional tests.

---
 .gitlab-ci.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4cf5716e..3b4f5b5be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: briar/ci-image-android:latest
 stages:
 - test
 - check_reproducibility
+- optional_tests
 
 test:
   stage: test
@@ -31,3 +32,24 @@ test_reproducible:
     - "curl -X POST -F token=${RELEASE_CHECK_TOKEN} -F ref=master -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/61/trigger/pipeline"
   only:
     - tags
+
+optional_tests:
+  stage: optional_tests
+  before_script:
+    - set -e
+    - export GRADLE_USER_HOME=$PWD/.gradle
+
+  cache:
+    paths:
+      - .gradle/wrapper
+      - .gradle/caches
+
+  script:
+    - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
+
+  after_script:
+    # these file change every time but should not be cached
+    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
+    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
+
+  when: manual

From 0fd59a26f60e3b151490ae3acd05dd0c5fd1f83a Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 29 Jan 2021 15:39:59 +0000
Subject: [PATCH 2/3] Raise BridgeTest timeout to avoid spurious failures.

---
 .../java/org/briarproject/bramble/plugin/tor/BridgeTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
index c06715d8b..f18289cc9 100644
--- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
+++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
@@ -53,7 +53,7 @@ public class BridgeTest extends BrambleTestCase {
 		return component.getCircumventionProvider().getBridges(false);
 	}
 
-	private final static long TIMEOUT = SECONDS.toMillis(30);
+	private final static long TIMEOUT = SECONDS.toMillis(60);
 
 	private final static Logger LOG = getLogger(BridgeTest.class.getName());
 

From 166b5d4addaa1be02b14745ecb096fbe94374ecc Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 29 Jan 2021 15:44:16 +0000
Subject: [PATCH 3/3] Run optional tests automatically for tags, otherwise
 manually.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b4f5b5be..3ba487ba7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,8 @@ image: briar/ci-image-android:latest
 
 stages:
 - test
-- check_reproducibility
 - optional_tests
+- check_reproducibility
 
 test:
   stage: test
@@ -33,7 +33,7 @@ test_reproducible:
   only:
     - tags
 
-optional_tests:
+.optional_tests:
   stage: optional_tests
   before_script:
     - set -e
@@ -52,4 +52,13 @@ optional_tests:
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
     - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
 
+manual_tests:
+  extends: .optional_tests
   when: manual
+  except:
+    - tags
+
+pre_release_tests:
+  extends: .optional_tests
+  only:
+    - tags