From 6e2e0bce0174a62b0ee8348d8ac0a288d11c3620 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Fri, 18 Oct 2024 13:20:28 +0100 Subject: [PATCH 1/6] cirrus-use-ax52_x86-64 --- .cirrus.yml | 220 ++++++++++++++++++++++++++-------------------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7f7a882ceef8..fd9a2801b928 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -92,122 +92,122 @@ compute_credits_template: &CREDITS_TEMPLATE # Only use credits for pull requests to the main repo use_compute_credits: $CIRRUS_REPO_FULL_NAME == 'bitcoin/bitcoin' && $CIRRUS_PR != "" -task: - name: 'lint' - << : *BASE_TEMPLATE - container: - image: debian:bookworm - cpu: 1 - memory: 1G - # For faster CI feedback, immediately schedule the linters - << : *CREDITS_TEMPLATE - test_runner_cache: - folder: "/lint_test_runner" - fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:test/lint/test_runner) - python_cache: - folder: "/python_build" - fingerprint_script: cat .python-version /etc/os-release - unshallow_script: - - git fetch --unshallow --no-tags - lint_script: - - ./ci/lint_run_all.sh - -task: - name: 'tidy' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: medium - env: - FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh" - -task: - name: 'ARM, unit tests, no functional tests' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: arm64 # Use arm64 worker to sidestep qemu and avoid a slow CI: https://github.com/bitcoin/bitcoin/pull/28087#issuecomment-1649399453 - env: - FILE_ENV: "./ci/test/00_setup_env_arm.sh" - -task: - name: 'Win64, unit tests, no gui tests, no functional tests' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: small - env: - FILE_ENV: "./ci/test/00_setup_env_win64.sh" - -task: - name: '32-bit CentOS, dash, gui' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: small - env: - FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh" - -task: - name: 'previous releases, depends DEBUG' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: small - env: - FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh" - -task: - name: 'TSan, depends, gui' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: medium - env: - FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" - -task: - name: 'MSan, depends' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: small - timeout_in: 300m # Use longer timeout for the *rare* case where a full build (llvm + msan + depends + ...) needs to be done. - env: - FILE_ENV: "./ci/test/00_setup_env_native_msan.sh" - -task: - name: 'fuzzer,address,undefined,integer, no depends' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: medium - env: - FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh" - -task: - name: 'multiprocess, i686, DEBUG' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: medium - env: - FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" +# task: +# name: 'lint' +# << : *BASE_TEMPLATE +# container: +# image: debian:bookworm +# cpu: 1 +# memory: 1G +# # For faster CI feedback, immediately schedule the linters +# << : *CREDITS_TEMPLATE +# test_runner_cache: +# folder: "/lint_test_runner" +# fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:test/lint/test_runner) +# python_cache: +# folder: "/python_build" +# fingerprint_script: cat .python-version /etc/os-release +# unshallow_script: +# - git fetch --unshallow --no-tags +# lint_script: +# - ./ci/lint_run_all.sh +# +# task: +# name: 'tidy' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: medium +# env: +# FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh" +# +# task: +# name: 'ARM, unit tests, no functional tests' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: arm64 # Use arm64 worker to sidestep qemu and avoid a slow CI: https://github.com/bitcoin/bitcoin/pull/28087#issuecomment-1649399453 +# env: +# FILE_ENV: "./ci/test/00_setup_env_arm.sh" +# +# task: +# name: 'Win64, unit tests, no gui tests, no functional tests' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: small +# env: +# FILE_ENV: "./ci/test/00_setup_env_win64.sh" +# +# task: +# name: '32-bit CentOS, dash, gui' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: small +# env: +# FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh" +# +# task: +# name: 'previous releases, depends DEBUG' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: small +# env: +# FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh" +# +# task: +# name: 'TSan, depends, gui' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: medium +# env: +# FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" +# +# task: +# name: 'MSan, depends' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: small +# timeout_in: 300m # Use longer timeout for the *rare* case where a full build (llvm + msan + depends + ...) needs to be done. +# env: +# FILE_ENV: "./ci/test/00_setup_env_native_msan.sh" +# +# task: +# name: 'fuzzer,address,undefined,integer, no depends' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: medium +# env: +# FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh" +# +# task: +# name: 'multiprocess, i686, DEBUG' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: medium +# env: +# FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" task: name: 'no wallet, libbitcoinkernel' << : *GLOBAL_TASK_TEMPLATE persistent_worker: labels: - type: small + type: ax52_x86-64 env: FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" -task: - name: 'macOS-cross, gui, no tests' - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: small - env: - FILE_ENV: "./ci/test/00_setup_env_mac_cross.sh" +# task: +# name: 'macOS-cross, gui, no tests' +# << : *GLOBAL_TASK_TEMPLATE +# persistent_worker: +# labels: +# type: small +# env: +# FILE_ENV: "./ci/test/00_setup_env_mac_cross.sh" From 731e82b0715e833123b58812e74f70c28ae291a1 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Fri, 18 Oct 2024 13:42:49 +0100 Subject: [PATCH 2/6] no git needed --- .cirrus.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index fd9a2801b928..124455ce63e5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -71,8 +71,6 @@ filter_template: &FILTER_TEMPLATE base_template: &BASE_TEMPLATE << : *FILTER_TEMPLATE merge_base_script: - # Require git (used in fingerprint_script). - - git --version || ( apt-get update && apt-get install -y git ) - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi - git fetch --depth=1 $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge" - git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts From c238584fc6556d944640935ff52188f2d707d5d0 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Fri, 25 Oct 2024 20:32:12 +0200 Subject: [PATCH 3/6] use resources --- .cirrus.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 124455ce63e5..50ef7c2b1b21 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -197,7 +197,11 @@ task: << : *GLOBAL_TASK_TEMPLATE persistent_worker: labels: - type: ax52_x86-64 + arch: "amd64" + resources: + cpu: 1 + memory: 2000 + env: FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" From 6d19e55ce31b91f699e4648f09377022ef8043e2 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Wed, 13 Nov 2024 20:36:00 +0000 Subject: [PATCH 4/6] don't use resources, only arch --- .cirrus.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 50ef7c2b1b21..9824f7545a59 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -198,9 +198,6 @@ task: persistent_worker: labels: arch: "amd64" - resources: - cpu: 1 - memory: 2000 env: FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" From 40d88f0b408f608599d02354e8735b315cbf7eb0 Mon Sep 17 00:00:00 2001 From: 0xb10c Date: Wed, 13 Nov 2024 21:43:35 +0100 Subject: [PATCH 5/6] test vetu ci --- .cirrus.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 9824f7545a59..1e1c11b77740 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -196,6 +196,11 @@ task: name: 'no wallet, libbitcoinkernel' << : *GLOBAL_TASK_TEMPLATE persistent_worker: + isolation: + vetu: + image: ubuntu:noble + user: admin + password: admin labels: arch: "amd64" From ddb7f5d7f615db0cfe6fe539b6aa36dafd52c8a8 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Wed, 13 Nov 2024 21:03:02 +0000 Subject: [PATCH 6/6] use ubuntu amd64 image (22.04) --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1e1c11b77740..56fe07484b6e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -194,11 +194,11 @@ compute_credits_template: &CREDITS_TEMPLATE task: name: 'no wallet, libbitcoinkernel' - << : *GLOBAL_TASK_TEMPLATE + <<: *GLOBAL_TASK_TEMPLATE persistent_worker: isolation: vetu: - image: ubuntu:noble + image: ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04 user: admin password: admin labels: