Add support for debian 12 ("Bookworm") x86

Fixes: TPA-717
mlira59 · Apr 22, 2024 · 9f8b133 · 9f8b133
1 parent 5fbff74
commit 9f8b133
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 8 deletions.
diff --git a/.github/config/matrix.yml b/.github/config/matrix.yml
@@ -10,11 +10,11 @@ default:
     - "ubuntu:20.04"
     - "ubuntu:22.04"
     - "debian:10"
+    - "debian:12"
     - "redhat:7"
     - "redhat:8"
     - "redhat:9"
     - "sles:15"
-    # - "debian:11"
   tpa_postgres_flavour: &default_tpa_postgres_flavour
     - "postgresql"
     - "pgextended"
@@ -95,6 +95,7 @@ patroni:
     - "ubuntu:20.04"
     - "debian:10"
     - "debian:11"
+    - "debian:12"
 #    - "redhat:7"  # Unsupported configuration TPA-335
     - "redhat:8"
     - "redhat:9"

diff --git a/.github/workflows/single_integration_test.yml b/.github/workflows/single_integration_test.yml
@@ -23,11 +23,12 @@ on:
         required: true
         type: choice
         options:
-        - tpa/debian:11
         - tpa/redhat:8
         - tpa/ubuntu:20.04
         - tpa/debian:9
         - tpa/debian:10
+        - tpa/debian:11
+        - tpa/debian:12
         - tpa/redhat:7
         - tpa/sles:15
         - tpa/redhat:9

diff --git a/docs/src/distributions.md b/docs/src/distributions.md
@@ -12,6 +12,7 @@ TPA and target systems on which TPA deploys the Postgres cluster.
 
 ## Debian x86
 
+* Debian 12/bookworm is fully supported
 * Debian 11/bullseye is fully supported
 * Debian 10/buster is fully supported
 * Debian 9/stretch is a legacy distribution

diff --git a/docs/src/local-repo.md b/docs/src/local-repo.md
@@ -50,7 +50,7 @@ it is ready to use immediately.
 To create a local repository manually, you must first create an
 appropriate directory structure. When using `--enable-local-repo`,
 TPA will create a `local-repo` directory and OS-specific
-subdirectories within it (e.g., `local-repo/Debian/10`), based on the OS
+subdirectories within it (e.g., `local-repo/Debian/12`), based on the OS
 you select for the cluster. We recommend that this structure is also
 used for manually created repositories.
 
@@ -92,7 +92,7 @@ tool for your system as detailed below.
 
 !!! Note
     You must generate the metadata in the subdirectory that the instance
-    will use, i.e., if you copy packages into `local-repo/Debian/10`, you
+    will use, i.e., if you copy packages into `local-repo/Debian/12`, you
     must create the metadata in that directory, not in `local-repo/Debian`.
 
 ### Debian/Ubuntu repository metadata
@@ -106,7 +106,7 @@ $ sudo apt-get update && sudo apt-get install -y dpkg-dev
 Now you can use `dpkg-scanpackages` to generate the metadata:
 
 ```shell
-$ cd local-repo/Debian/buster
+$ cd local-repo/Debian/bookworm
 # download/copy .deb package files
 $ dpkg-scanpackages . | gzip > Packages.gz
 ```

diff --git a/docs/src/platform-bare.md b/docs/src/platform-bare.md
@@ -71,7 +71,7 @@ For more details:
 
 TPA will try to detect the distribution running on target instances,
 and fail if it is not supported. TPA currently supports Debian
-(8/9/10; or jessie/stretch/buster), Ubuntu (16.04/18.04/20.04/22.04; or
+(10/11/12; or buster/bullseye/bookworm), Ubuntu (16.04/18.04/20.04/22.04; or
 xenial/bionic/focal/jammy), and RHEL/CentOS/Rocky/AlmaLinux (7.x/8.x) on `bare` instances.
 
 ## IP addresses

diff --git a/docs/src/python.md b/docs/src/python.md
@@ -10,6 +10,8 @@ according to the distribution.
 
 Distribution| Python 2| Python 3
 ----|----|----
+Debian 12/bookworm|✓|✓ (3.11)
+Debian 11/bullseye|✓|✓ (3.9)
 Debian 10/buster|✓|✓ (3.7)
 Debian 9/stretch|✓|✓ (3.5)
 Debian 8/jessie|✓|✗ (3.4)

diff --git a/lib/tpaexec/platforms/docker.py b/lib/tpaexec/platforms/docker.py
@@ -152,7 +152,7 @@ def image(self, label, **kwargs):
                 "os_family": "RedHat",
             },
             "tpa/debian": {
-                "versions": ["stretch", "buster", "bullseye", "9", "10", "11"],
+                "versions": ["stretch", "buster", "bullseye", "bookworm", "9", "10", "11", "12"],
                 "os": "Debian",
             },
             "tpa/redhat": {

diff --git a/library/minimal_setup b/library/minimal_setup
@@ -29,7 +29,7 @@ case "${ID}:${VERSION_ID%.*}" in
         python=python2.7
         python_pkg_prefix=python
         ;;
-    debian:9|debian:10|debian:11)
+    debian:9|debian:10|debian:11|debian:12)
         distribution=Debian
         release=${VERSION_CODENAME:-stretch}
         python=${preferred_python_version:-python3}

diff --git a/platforms/docker/docker_image.yml b/platforms/docker/docker_image.yml
@@ -74,6 +74,8 @@
       debian-buster: debian:10
       debian-11: debian:11
       debian-bullseye: debian:11
+      debian-12: debian:12
+      debian-bookworm: debian:12
       oraclelinux-7: oraclelinux:7
       oraclelinux-8: oraclelinux:8
       oraclelinux-9: oraclelinux:9

diff --git a/relnotes/TPA-717 b/relnotes/TPA-717
@@ -0,0 +1,12 @@
+- summary: Add support for debian 12 x86
+  description: |
+    Now it's posible to enjoy tpaexec packages for bookworm but also create
+    and manage clusters in either docker and AWS.
+  # Possible types: notable_change, minor_change, bugfix or breaking_change
+  type: notable_change
+  # At least one between jira_tickets or support_tickets must be defined. You
+  # can define both if you want
+  # You must have at least one list item in each *_tickets section that is
+  # defined
+  jira_tickets:
+  - TPA-717
diff --git a/roles/efm/pkg/vars/Debian-12.yml b/roles/efm/pkg/vars/Debian-12.yml
@@ -0,0 +1,8 @@
+---
+
+# © Copyright EnterpriseDB UK Limited 2015-2024 - All rights reserved.
+
+efm_dependency_packages:
+  - openjdk-17-jre
+  - iputils-ping
+  - procps