From c6ac03f1a4c3df2a4311ab263494936efc1e4195 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 25 Nov 2023 14:44:31 +0100 Subject: [PATCH 1/6] .cirrus.yml: s/master/main/ --- .cirrus.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8df130b66e..3eb95542d6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -44,12 +44,11 @@ debian_default_toolchain_task: - container: image: collectd/ci:focal_amd64 allow_failures: false - # debian/unstable is expected to fail - - allow_failures: true + - container: + image: collectd/ci:sid_amd64 # unstable + allow_failures: true skip_notifications: true - only_if: $CIRRUS_BRANCH == 'master' - container: - image: collectd/ci:sid_amd64 + only_if: $CIRRUS_BRANCH == 'main' configure_script: - ./build.sh - gcc --version @@ -82,7 +81,7 @@ redhat_default_toolchain_task: # fedora/rawhide is expected to fail - allow_failures: true skip_notifications: true - only_if: $CIRRUS_BRANCH == 'master' + only_if: $CIRRUS_BRANCH == 'main' container: image: collectd/ci:fedora_rawhide_x86_64 configure_script: @@ -198,7 +197,7 @@ non_standard_toolchains_task: bleeding_edge_compilers_task: container: image: collectd/ci:sid_amd64 - only_if: $CIRRUS_BRANCH == 'master' + only_if: $CIRRUS_BRANCH == 'main' allow_failures: true skip_notifications: true env: From 73524c2898268d4142499c7bb42d52008c190a68 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 25 Nov 2023 14:52:39 +0100 Subject: [PATCH 2/6] .cirrus.yml: remove obsolete platforms, add recent ones. --- .cirrus.yml | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3eb95542d6..7099d16184 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,7 +9,7 @@ env: # release_ready_task: container: - image: collectd/ci:buster_amd64 + image: collectd/ci:bookworm_amd64 lint_script: - /checks/check-bashisms.sh - /checks/check-pod.sh @@ -27,22 +27,10 @@ release_ready_task: debian_default_toolchain_task: matrix: - container: - image: collectd/ci:buster_amd64 + image: collectd/ci:bookworm_amd64 allow_failures: false - container: - image: collectd/ci:stretch_amd64 - allow_failures: false - - container: - image: collectd/ci:stretch_i386 - allow_failures: false - - container: - image: collectd/ci:xenial_amd64 - allow_failures: false - - container: - image: collectd/ci:bionic_amd64 - allow_failures: false - - container: - image: collectd/ci:focal_amd64 + image: collectd/ci:mantic_amd64 allow_failures: false - container: image: collectd/ci:sid_amd64 # unstable @@ -70,14 +58,14 @@ debian_default_toolchain_task: # redhat_default_toolchain_task: matrix: - - allow_failures: true + - container: + image: collectd/ci:el9_x86_64 + allow_failures: true skip_notifications: true - container: - image: collectd/ci:el7_x86_64 # TODO: fix this platform - - allow_failures: true + - container: + image: collectd/ci:fedora39 + allow_failures: true skip_notifications: true - container: - image: collectd/ci:fedora28_x86_64 # fedora/rawhide is expected to fail - allow_failures: true skip_notifications: true From 6c5db5d38a2aa58e6ee2ffa168c1cc5ea025c800 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 25 Nov 2023 15:04:10 +0100 Subject: [PATCH 3/6] .cirrus.yml: Add task for FreeBSD builds. --- .cirrus.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 7099d16184..2bd56be061 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -209,3 +209,23 @@ bleeding_edge_compilers_task: - make -j2 -sk tests_script: - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false + +freebsd_task: + freebsd_instance: + matrix: + - image_family: freebsd-13-2 + allow_failures: false + pkg_install_script: + - > + pkg install --yes + autotools + bison + flex + pkgconf + configure_script: + - ./build.sh + - ./configure --disable-perl + build_script: + - make -j$(nproc) -sk + tests_script: + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log && false From eb02259653c01d60d4ec9bd1f98297d5f4654b54 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 25 Nov 2023 15:47:28 +0100 Subject: [PATCH 4/6] .cirrus.yml: set parallelism to number of CPUs. --- .cirrus.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2bd56be061..d8c4bbf4ef 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,7 +17,7 @@ release_ready_task: - ./build.sh - ./configure $DEFAULT_CONFIG_OPTS checks_script: - - make -j2 -s distcheck DISTCHECK_CONFIGURE_FLAGS="${DEFAULT_CONFIG_OPTS}" + - make -j$(nproc) -s distcheck DISTCHECK_CONFIGURE_FLAGS="${DEFAULT_CONFIG_OPTS}" ### # Default toolchain and build flags used in deb packages, on a range of Debian @@ -46,9 +46,9 @@ debian_default_toolchain_task: CPPLAGS="$(dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(dpkg-buildflags --get LDFLAGS)" build_script: - - make -j2 -sk + - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false - /checks/check-built-plugins.sh ### @@ -77,9 +77,9 @@ redhat_default_toolchain_task: - gcc --version - ./configure CC=gcc $DEFAULT_CONFIG_OPTS CFLAGS="$(rpm --eval '%optflags')" build_script: - - make -j2 -sk + - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false - /checks/check-built-plugins.sh @@ -109,9 +109,9 @@ non_standard_toolchains_task: CPPLAGS="$(dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(dpkg-buildflags --get LDFLAGS)" build_script: - - make -j2 -sk + - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false # build against libstatgrab, should always pass - env: @@ -127,7 +127,7 @@ non_standard_toolchains_task: CPPLAGS="$(dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(dpkg-buildflags --get LDFLAGS)" build_script: - - make -j2 -sk + - make -j$(nproc) -sk tests_script: - > for i in cpu disk interface load memory swap users; do @@ -174,9 +174,9 @@ non_standard_toolchains_task: -Wno-typedef-redefinition -Wno-gnu-variable-sized-type-not-at-end' build_script: - - make -j2 -sk + - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false ### # Build using a range of compilers, available in debian/unstable. NB: might @@ -206,9 +206,9 @@ bleeding_edge_compilers_task: CPPLAGS="$(dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(dpkg-buildflags --get LDFLAGS)" build_script: - - make -j2 -sk + - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false freebsd_task: freebsd_instance: @@ -228,4 +228,4 @@ freebsd_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log && false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log && false From 93ec41f54d3a1ced2714d1f5b831dacfae088ef5 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 25 Nov 2023 15:49:54 +0100 Subject: [PATCH 5/6] .cirrus.yml: Fix reporting of test failure. --- .cirrus.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d8c4bbf4ef..8b8f40fafb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -48,7 +48,7 @@ debian_default_toolchain_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) - /checks/check-built-plugins.sh ### @@ -79,7 +79,7 @@ redhat_default_toolchain_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) - /checks/check-built-plugins.sh @@ -111,7 +111,7 @@ non_standard_toolchains_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) # build against libstatgrab, should always pass - env: @@ -176,7 +176,7 @@ non_standard_toolchains_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) ### # Build using a range of compilers, available in debian/unstable. NB: might @@ -208,7 +208,7 @@ bleeding_edge_compilers_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log || false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) freebsd_task: freebsd_instance: @@ -228,4 +228,4 @@ freebsd_task: build_script: - make -j$(nproc) -sk tests_script: - - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || cat ./test-suite.log && false + - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false) From 0d8aa6aa4864779ec6a12300884fd5496053c9b9 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 26 Nov 2023 22:01:17 +0100 Subject: [PATCH 6/6] .cirrus.yml: Report failures from CentOS 9 and Fedora 39. --- .cirrus.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8b8f40fafb..b2cee41f6b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -60,18 +60,15 @@ redhat_default_toolchain_task: matrix: - container: image: collectd/ci:el9_x86_64 - allow_failures: true - skip_notifications: true + allow_failures: false - container: image: collectd/ci:fedora39 + allow_failures: false + - container: + image: collectd/ci:fedora_rawhide_x86_64 allow_failures: true skip_notifications: true - # fedora/rawhide is expected to fail - - allow_failures: true - skip_notifications: true only_if: $CIRRUS_BRANCH == 'main' - container: - image: collectd/ci:fedora_rawhide_x86_64 configure_script: - ./build.sh - gcc --version @@ -89,7 +86,7 @@ redhat_default_toolchain_task: # Some are expected to fail, others should always pass non_standard_toolchains_task: container: - image: collectd/ci:stretch_amd64 + image: collectd/ci:bookworm_amd64 only_if: $CIRRUS_PR == '' matrix: