From d79de7ac2e1ce08388aaef190c5a5cba96a3718d Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Tue, 28 Dec 2021 04:46:47 +0000
Subject: [PATCH 1/2] Cirrus: Use VM instead of Docker for functional tests

---
 .cirrus.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d5a780d95..02abd877d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -88,13 +88,15 @@ task:
 
 task:
   name: Regtest functional tests
-  container:
-    image: $ELECTRUM_IMAGE
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
     cpu: 1
     memory: 1G
   pip_cache:
     folder: ~/.cache/pip
-    fingerprint_script: echo Regtest && echo $ELECTRUM_IMAGE && cat $ELECTRUM_REQUIREMENTS
+    fingerprint_script: echo Regtest && echo docker_builder && cat $ELECTRUM_REQUIREMENTS
     populate_script: mkdir -p ~/.cache/pip
   electrum_cache:
     folder: /tmp/electrum-build
@@ -121,7 +123,6 @@ task:
     - sleep 10s
     - python3 -m unittest electrum/tests/regtest.py
   env:
-    ELECTRUM_IMAGE: python:3.7
     ELECTRUM_REQUIREMENTS: contrib/requirements/requirements-travis.txt
     # ElectrumX exits with an error without this:
     ALLOW_ROOT: 1

From 8ab97d7d4040050dca5d6885676b5e925b6281c5 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Tue, 28 Dec 2021 04:58:45 +0000
Subject: [PATCH 2/2] Cirrus: Use hardcoded ElectrumX v1.15.0 in functional
 tests

---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 02abd877d..1bdb359d1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -108,7 +108,8 @@ task:
     - apt-get update
     - apt-get -y install libsecp256k1-0 curl jq bc
     - pip3 install .[tests]
-    - pip3 install electrumx
+    #- pip3 install e-x # Broken because of https://github.com/spesmilo/electrumx/issues/117 , use older version for now.
+    - pip3 install electrumx==1.15.0
     - "BITCOIND_VERSION=$(curl https://bitcoincore.org/en/download/ | grep -E -i --only-matching 'Latest version: [0-9\\.]+' | grep -E --only-matching '[0-9\\.]+')"
     - BITCOIND_FILENAME=bitcoin-$BITCOIND_VERSION-x86_64-linux-gnu.tar.gz
     - BITCOIND_PATH=/tmp/bitcoind/$BITCOIND_FILENAME