From 14668455b50706dd0e27ef013e5c04f6a6378260 Mon Sep 17 00:00:00 2001 From: gardar Date: Tue, 22 Aug 2023 02:14:29 +0000 Subject: [PATCH 1/3] minor: support debian 12 Signed-off-by: gardar --- .config/molecule/config.yml | 6 ++++++ roles/alertmanager/meta/main.yml | 1 + roles/blackbox_exporter/meta/main.yml | 1 + roles/chrony_exporter/meta/main.yml | 1 + roles/mysqld_exporter/meta/main.yml | 1 + roles/node_exporter/meta/main.yml | 1 + roles/prometheus/meta/main.yml | 1 + roles/pushgateway/meta/main.yml | 1 + roles/smokeping_prober/meta/main.yml | 1 + roles/snmp_exporter/meta/main.yml | 1 + roles/systemd_exporter/meta/main.yml | 1 + 11 files changed, 16 insertions(+) diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml index abc65e87b..fca14b4d2 100644 --- a/.config/molecule/config.yml +++ b/.config/molecule/config.yml @@ -46,6 +46,12 @@ platforms: privileged: true cgroup_parent: docker.slice command: /lib/systemd/systemd + - name: debian-12 + image: dokken/debian-12 + pre_build_image: true + privileged: true + cgroup_parent: docker.slice + command: /lib/systemd/systemd - name: fedora-36 image: dokken/fedora-36 pre_build_image: true diff --git a/roles/alertmanager/meta/main.yml b/roles/alertmanager/meta/main.yml index 36ebeb50f..30c0b5b43 100644 --- a/roles/alertmanager/meta/main.yml +++ b/roles/alertmanager/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/blackbox_exporter/meta/main.yml b/roles/blackbox_exporter/meta/main.yml index f0597c218..2dc66e987 100644 --- a/roles/blackbox_exporter/meta/main.yml +++ b/roles/blackbox_exporter/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/chrony_exporter/meta/main.yml b/roles/chrony_exporter/meta/main.yml index 4bf81cc12..b985655b9 100644 --- a/roles/chrony_exporter/meta/main.yml +++ b/roles/chrony_exporter/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/mysqld_exporter/meta/main.yml b/roles/mysqld_exporter/meta/main.yml index 6a660a78b..d2543f541 100644 --- a/roles/mysqld_exporter/meta/main.yml +++ b/roles/mysqld_exporter/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/node_exporter/meta/main.yml b/roles/node_exporter/meta/main.yml index 180557dd3..351f4a666 100644 --- a/roles/node_exporter/meta/main.yml +++ b/roles/node_exporter/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml index 42dd07dae..155a7f482 100644 --- a/roles/prometheus/meta/main.yml +++ b/roles/prometheus/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/pushgateway/meta/main.yml b/roles/pushgateway/meta/main.yml index 2e5e2879a..65cfac069 100644 --- a/roles/pushgateway/meta/main.yml +++ b/roles/pushgateway/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/smokeping_prober/meta/main.yml b/roles/smokeping_prober/meta/main.yml index 80ee360e0..2165aa81e 100644 --- a/roles/smokeping_prober/meta/main.yml +++ b/roles/smokeping_prober/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/snmp_exporter/meta/main.yml b/roles/snmp_exporter/meta/main.yml index cc065d5b1..a260df96a 100644 --- a/roles/snmp_exporter/meta/main.yml +++ b/roles/snmp_exporter/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" diff --git a/roles/systemd_exporter/meta/main.yml b/roles/systemd_exporter/meta/main.yml index c074a1cde..46078eeba 100644 --- a/roles/systemd_exporter/meta/main.yml +++ b/roles/systemd_exporter/meta/main.yml @@ -15,6 +15,7 @@ galaxy_info: versions: - "bullseye" - "buster" + - bookworm - name: "EL" versions: - "7" From 3ba3d87c8a99c2ce1b708866d24308303e456544 Mon Sep 17 00:00:00 2001 From: gardar Date: Tue, 22 Aug 2023 13:36:20 +0000 Subject: [PATCH 2/3] trivial: quote style consistency Signed-off-by: gardar --- roles/alertmanager/meta/main.yml | 2 +- roles/blackbox_exporter/meta/main.yml | 2 +- roles/chrony_exporter/meta/main.yml | 2 +- roles/mysqld_exporter/meta/main.yml | 2 +- roles/node_exporter/meta/main.yml | 2 +- roles/prometheus/meta/main.yml | 2 +- roles/pushgateway/meta/main.yml | 2 +- roles/smokeping_prober/meta/main.yml | 2 +- roles/snmp_exporter/meta/main.yml | 2 +- roles/systemd_exporter/meta/main.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/alertmanager/meta/main.yml b/roles/alertmanager/meta/main.yml index 7101e1333..092f30ced 100644 --- a/roles/alertmanager/meta/main.yml +++ b/roles/alertmanager/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/blackbox_exporter/meta/main.yml b/roles/blackbox_exporter/meta/main.yml index 6c182a3e5..0e93483f0 100644 --- a/roles/blackbox_exporter/meta/main.yml +++ b/roles/blackbox_exporter/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/chrony_exporter/meta/main.yml b/roles/chrony_exporter/meta/main.yml index eae74979f..5416954f3 100644 --- a/roles/chrony_exporter/meta/main.yml +++ b/roles/chrony_exporter/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/mysqld_exporter/meta/main.yml b/roles/mysqld_exporter/meta/main.yml index 0879b02b7..b826cc89f 100644 --- a/roles/mysqld_exporter/meta/main.yml +++ b/roles/mysqld_exporter/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/node_exporter/meta/main.yml b/roles/node_exporter/meta/main.yml index be69cb852..e0ebda79f 100644 --- a/roles/node_exporter/meta/main.yml +++ b/roles/node_exporter/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml index d15481e1b..9d2c59d8f 100644 --- a/roles/prometheus/meta/main.yml +++ b/roles/prometheus/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/pushgateway/meta/main.yml b/roles/pushgateway/meta/main.yml index 4b7fa68e6..839c88442 100644 --- a/roles/pushgateway/meta/main.yml +++ b/roles/pushgateway/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/smokeping_prober/meta/main.yml b/roles/smokeping_prober/meta/main.yml index d8622a255..0bf7a7680 100644 --- a/roles/smokeping_prober/meta/main.yml +++ b/roles/smokeping_prober/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/snmp_exporter/meta/main.yml b/roles/snmp_exporter/meta/main.yml index e5c6c9e6a..9051c2837 100644 --- a/roles/snmp_exporter/meta/main.yml +++ b/roles/snmp_exporter/meta/main.yml @@ -13,7 +13,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" diff --git a/roles/systemd_exporter/meta/main.yml b/roles/systemd_exporter/meta/main.yml index 42df1ac09..026ec9932 100644 --- a/roles/systemd_exporter/meta/main.yml +++ b/roles/systemd_exporter/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: versions: - "bullseye" - "buster" - - bookworm + - "bookworm" - name: "EL" versions: - "7" From f9a94ec2102b3cf74847717967dd3dd36a98c63b Mon Sep 17 00:00:00 2001 From: gardar Date: Tue, 22 Aug 2023 13:39:47 +0000 Subject: [PATCH 3/3] fix: debian 12 is missing python and needs prepare Signed-off-by: gardar --- .config/molecule/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml index 1b759a59b..cd7f9e346 100644 --- a/.config/molecule/config.yml +++ b/.config/molecule/config.yml @@ -48,7 +48,7 @@ platforms: command: /lib/systemd/systemd - name: debian-12 image: dokken/debian-12 - pre_build_image: true + pre_build_image: false privileged: true cgroup_parent: docker.slice command: /lib/systemd/systemd