Merge pull request collectd#4208 from octo/6/built-plugins

.cirrus.yml: Provide expected plugin list to `check-built-plugins.sh` if present.

.cirrus.yml

@@ -9,7 +9,7 @@ env:
 #
 release_ready_task:
   container:
-    image: collectd/ci:bookworm_amd64
+    image: collectd/ci:debian12
   lint_script:
     - /checks/check-bashisms.sh
     - /checks/check-pod.sh
@@ -27,16 +27,22 @@ release_ready_task:
 debian_default_toolchain_task:
   matrix:
     - container:
-        image: collectd/ci:bookworm_amd64
+        image: collectd/ci:debian12
       allow_failures: false
+      env:
+        CONTAINER_IMAGE: debian12
     - container:
-        image: collectd/ci:mantic_amd64
+        image: collectd/ci:ubuntu23.10
       allow_failures: false
+      env:
+        CONTAINER_IMAGE: ubuntu23.10
     - container:
         image: collectd/ci:debian_unstable
       allow_failures: true
       skip_notifications: true
       only_if: $CIRRUS_BRANCH == 'main'
+      env:
+        CONTAINER_IMAGE: debian_unstable
   configure_script:
     - ./build.sh
     - gcc --version
@@ -49,7 +55,12 @@ debian_default_toolchain_task:
     - make -j$(nproc) -sk
   tests_script:
     - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false)
-    - /checks/check-built-plugins.sh
+    - |
+      if [[ -e ".expected-plugins/$CONTAINER_IMAGE" ]]; then
+        /checks/check-built-plugins.sh ".expected-plugins/$CONTAINER_IMAGE"
+      else
+        /checks/check-built-plugins.sh
+      fi
 
 ###
 # Default toolchain and build flags used in RPM packages, on a range of RedHat
@@ -59,16 +70,22 @@ debian_default_toolchain_task:
 redhat_default_toolchain_task:
   matrix:
     - container:
-        image: collectd/ci:el9_x86_64
+        image: collectd/ci:centos9
       allow_failures: false
+      env:
+        CONTAINER_IMAGE: centos9
     - container:
         image: collectd/ci:fedora39
       allow_failures: false
+      env:
+        CONTAINER_IMAGE: fedora39
     - container:
-        image: collectd/ci:fedora_rawhide_x86_64
+        image: collectd/ci:fedora_main
       allow_failures: true
       skip_notifications: true
       only_if: $CIRRUS_BRANCH == 'main'
+      env:
+        CONTAINER_IMAGE: fedora_main
   configure_script:
     - ./build.sh
     - gcc --version
@@ -77,7 +94,12 @@ redhat_default_toolchain_task:
     - make -j$(nproc) -sk
   tests_script:
     - VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j$(nproc) -sk check || (cat ./test-suite.log && false)
-    - /checks/check-built-plugins.sh
+    - |
+      if [[ -e ".expected-plugins/$CONTAINER_IMAGE" ]]; then
+        /checks/check-built-plugins.sh ".expected-plugins/$CONTAINER_IMAGE"
+      else
+        /checks/check-built-plugins.sh
+      fi
 
 
 ###
@@ -86,7 +108,7 @@ redhat_default_toolchain_task:
 # Some are expected to fail, others should always pass
 non_standard_toolchains_task:
   container:
-    image: collectd/ci:bookworm_amd64
+    image: collectd/ci:debian12
   only_if: $CIRRUS_PR == ''
 
   matrix:

.expected-plugins/centos9

@@ -0,0 +1,113 @@
+# CentOS 9
+libcollectdclient
+apache
+apcups
+battery
+bind
+buddyinfo
+capabilities
+ceph
+cgroups
+chrony
+connectivity
+conntrack
+contextswitch
+cpu
+cpufreq
+cpusleep
+curl
+curl_json
+dbi
+df
+disk
+dns
+dpdk_telemetry
+dpdkevents
+dpdkstat
+drbd
+email
+entropy
+ethstat
+exec
+fhcount
+filecount
+fscache
+gps
+hddtemp
+hugepages
+infiniband
+intel_pmu
+intel_rdt
+interface
+ipc
+ipmi
+iptables
+ipvs
+irq
+load
+log_logstash
+logfile
+logparser
+madwifi
+mbmon
+mcelog
+md
+mdevents
+memcachec
+memcached
+memory
+mmc
+multimeter
+mysql
+netlink
+nfs
+nginx
+notify_desktop
+notify_email
+notify_nagios
+ntpd
+numa
+nut
+olsrd
+openvpn
+ovs_events
+ovs_stats
+pcie_errors
+pinba
+ping
+powerdns
+processes
+procevent
+protocols
+sensors
+serial
+smart
+swap
+synproxy
+sysevent
+syslog
+table
+tail
+tail_csv
+tcpconns
+teamspeak2
+ted
+thermal
+turbostat
+ubi
+unixsock
+uptime
+users
+uuid
+varnish
+virt
+vmem
+vserver
+wireless
+write_http
+write_influxdb_udp
+write_log
+write_prometheus
+write_stackdriver
+zfs_arc
+zookeeper

.expected-plugins/debian10

@@ -0,0 +1,115 @@
+# Debian 10 ("Buster")
+libcollectdclient
+apache
+apcups
+battery
+bind
+buddyinfo
+capabilities
+ceph
+cgroups
+chrony
+connectivity
+conntrack
+contextswitch
+cpu
+cpufreq
+cpusleep
+curl
+curl_json
+dbi
+df
+disk
+dns
+dpdkevents
+dpdkstat
+dpdk_telemetry
+drbd
+email
+entropy
+ethstat
+exec
+fhcount
+filecount
+fscache
+gps
+hddtemp
+hugepages
+infiniband
+intel_rdt
+interface
+ipc
+ipmi
+iptables
+ipvs
+irq
+load
+logfile
+log_logstash
+logparser
+madwifi
+mbmon
+mcelog
+md
+mdevents
+memcachec
+memcached
+memory
+mmc
+multimeter
+mysql
+netlink
+nfs
+nginx
+notify_desktop
+notify_email
+notify_nagios
+ntpd
+numa
+nut
+olsrd
+onewire
+openvpn
+ovs_events
+ovs_stats
+pcie_errors
+pinba
+ping
+powerdns
+processes
+procevent
+protocols
+sensors
+serial
+smart
+swap
+synproxy
+sysevent
+syslog
+table
+tail
+tail_csv
+tcpconns
+teamspeak2
+ted
+thermal
+tokyotyrant
+turbostat
+ubi
+unixsock
+uptime
+users
+uuid
+varnish
+virt
+vmem
+vserver
+wireless
+write_http
+write_influxdb_udp
+write_log
+write_prometheus
+write_stackdriver
+xencpu
+zfs_arc
+zookeeper