From 5bd671b8bfeda3f2c4b9a226cf0c2f4ec783eca0 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sat, 24 Jun 2023 23:56:09 +0200
Subject: [PATCH] [PR #6779/8b5dc27d backport][stable-7] Add Debian Bookworm to
 CI (#6782)

Add Debian Bookworm to CI (#6779)

* Add Debian Bookworm to CI.

* The package has been netcat-openbsd for some time now. The transitional package was removed in Debian 12.

(cherry picked from commit 8b5dc27d235e1fe3e047f507583cd828d6308940)

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 .azure-pipelines/azure-pipelines.yml                |  2 ++
 .../targets/listen_ports_facts/tasks/main.yml       |  2 +-
 .../setup_postgresql_db/vars/Debian-12-py3.yml      | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/integration/targets/setup_postgresql_db/vars/Debian-12-py3.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index b4c536205e..097c5585a8 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -337,6 +337,8 @@ stages:
           targets:
             - name: Debian Bullseye
               test: debian-bullseye/3.9
+            - name: Debian Bookworm
+              test: debian-bookworm/3.11
             - name: ArchLinux
               test: archlinux/3.11
             - name: CentOS Stream 8
diff --git a/tests/integration/targets/listen_ports_facts/tasks/main.yml b/tests/integration/targets/listen_ports_facts/tasks/main.yml
index 70649f5056..0e583e7a13 100644
--- a/tests/integration/targets/listen_ports_facts/tasks/main.yml
+++ b/tests/integration/targets/listen_ports_facts/tasks/main.yml
@@ -13,7 +13,7 @@
   ansible.builtin.package:
     name:
       - net-tools
-      - netcat
+      - netcat-openbsd
     state: latest
   when: ansible_os_family == "Debian"
 
diff --git a/tests/integration/targets/setup_postgresql_db/vars/Debian-12-py3.yml b/tests/integration/targets/setup_postgresql_db/vars/Debian-12-py3.yml
new file mode 100644
index 0000000000..c922402376
--- /dev/null
+++ b/tests/integration/targets/setup_postgresql_db/vars/Debian-12-py3.yml
@@ -0,0 +1,13 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+postgresql_packages:
+  - "postgresql"
+  - "postgresql-common"
+  - "python3-psycopg2"
+
+pg_hba_location: "/etc/postgresql/15/main/pg_hba.conf"
+pg_dir: "/var/lib/postgresql/15/main"
+pg_ver: 15