From acbea5b689e887d86b02d29de8e7e256798ae1d4 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 27 Dec 2022 00:55:41 +0000 Subject: [PATCH 1/2] Cirrus: Add Debian functional tests --- .cirrus.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index eb831ac..0a3b7f8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -168,13 +168,25 @@ task: GOX_TAGS: "" task: - name: "Functional Tests Ubuntu Go $GO_VERSION$MODULES_NAME" - compute_engine_instance: - image_project: cirrus-images - image: family/docker-builder - platform: linux - cpu: 1 - memory: 1G + name: "Functional Tests $CI_DISTRO Go $GO_VERSION$MODULES_NAME" + alias: "Functional Tests" + matrix: + - compute_engine_instance: + image_project: debian-cloud + image: family/debian-11 + platform: linux + cpu: 1 + memory: 1G + env: + CI_DISTRO: debian + - compute_engine_instance: + image_project: cirrus-images + image: family/docker-builder + platform: linux + cpu: 1 + memory: 1G + env: + CI_DISTRO: ubuntu bitcoind_cache: folder: /tmp/bitcoind populate_script: mkdir -p /tmp/bitcoind @@ -300,7 +312,7 @@ task: - ShellCheck - Unit Tests - Cross-Compile - - Functional Tests Ubuntu Go latest + - Functional Tests bin_cache: folder: "idist" fingerprint_script: From 7cf7f1ab4ba03805b912b56eea141c51d3fbc05e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 28 Dec 2022 03:23:10 +0000 Subject: [PATCH 2/2] Cirrus: Fix missing "dig" dependency on Debian --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0a3b7f8..3eac681 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -192,7 +192,8 @@ task: populate_script: mkdir -p /tmp/bitcoind install_script: - apt-get update - - apt-get install -y dnssec-trigger + # bind9-dnsutils contains dig + - apt-get install -y dnssec-trigger bind9-dnsutils # Namecoin Core - BITCOIND_URL=$(curl https://www.namecoin.org/download/ | grep x86_64-linux-gnu.tar.gz | grep -v 0.13.99 | grep --only-matching https://.*.tar.gz) - BITCOIND_FILENAME=$(echo $BITCOIND_URL | grep -E --only-matching 'namecoin-nc.*.tar.gz')