Add Debian 12 to our CI and platform support document. (#14529)

* Fix handling of base images for CI jobs.

This allows us to continue using properly descriptive names despite
Debian not publishing docker images with version numbers.

* Add Debian 12 to CI and platform support documentation.

* Fix build matrix generation scripts.

6 files changed, 20 insertions, 10 deletions

diff --git a/.github/data/distros.yml b/.github/data/distros.yml
index 452170c079..5cfd060fe7 100644
--- a/.github/data/distros.yml
+++ b/.github/data/distros.yml
@@ -83,14 +83,15 @@ include:
 
   - &debian
     distro: debian
-    version: "11"
+    version: "12"
+    base_image: debian:bookworm
     env_prep: |
       apt-get update
     jsonc_removal: |
       apt-get purge -y libjson-c-dev
     packages: &debian_packages
       type: deb
-      repo_distro: debian/bullseye
+      repo_distro: debian/bookworm
       arches:
         - i386
         - amd64
@@ -99,7 +100,16 @@ include:
     test:
       ebpf-core: true
   - <<: *debian
+    version: "11"
+    base_image: debian:bullseye
+    packages:
+      <<: *debian_packages
+      repo_distro: debian/bullseye
+    test:
+      ebpf-core: false
+  - <<: *debian
     version: "10"
+    base_image: debian:buster
     packages:
       <<: *debian_packages
       repo_distro: debian/buster
@@ -130,7 +140,7 @@ include:
   - &opensuse
     distro: opensuse
     version: "15.4"
-    base_image: opensuse/leap
+    base_image: opensuse/leap:15.4
     jsonc_removal: |
       zypper rm -y libjson-c-devel
     packages: &opensuse_packages
diff --git a/.github/scripts/gen-matrix-build.py b/.github/scripts/gen-matrix-build.py
index 28406470ff..3185e88361 100755
--- a/.github/scripts/gen-matrix-build.py
+++ b/.github/scripts/gen-matrix-build.py
@@ -17,7 +17,7 @@ for i, v in enumerate(data['include']):
     }
 
     if 'base_image' in v:
-        e['distro'] = ':'.join([v['base_image'], str(v['version'])])
+        e['distro'] = v['base_image']
     else:
         e['distro'] = ':'.join([v['distro'], str(v['version'])])
 
diff --git a/.github/scripts/gen-matrix-packaging.py b/.github/scripts/gen-matrix-packaging.py
index 01e9ec7909..9347cd7674 100755
--- a/.github/scripts/gen-matrix-packaging.py
+++ b/.github/scripts/gen-matrix-packaging.py
@@ -26,7 +26,7 @@ for i, v in enumerate(data['include']):
                     'version': data['include'][i]['version'],
                     'repo_distro': data['include'][i]['packages']['repo_distro'],
                     'format': data['include'][i]['packages']['type'],
-                    'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else data['include'][i]['distro'],
+                    'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else ':'.join([data['include'][i]['distro'], data['include'][i]['version']]),
                     'platform': data['platform_map'][arch],
                     'arch': arch
                 })
diff --git a/.github/scripts/gen-matrix-repoconfig.py b/.github/scripts/gen-matrix-repoconfig.py
index 46f671697d..264cd53e76 100755
--- a/.github/scripts/gen-matrix-repoconfig.py
+++ b/.github/scripts/gen-matrix-repoconfig.py
@@ -17,7 +17,7 @@ for i, v in enumerate(data['include']):
             'version': data['include'][i]['version'],
             'pkgclouddistro': data['include'][i]['packages']['repo_distro'],
             'format': data['include'][i]['packages']['type'],
-            'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else data['include'][i]['distro'],
+            'base_image': data['include'][i]['base_image'] if 'base_image' in data['include'][i] else ':'.join([data['include'][i]['distro'], data['include'][i]['version']]),
             'platform': data['platform_map']['amd64'],
             'arches': ' '.join(['"' + x + '"' for x in data['include'][i]['packages']['arches']])
         })
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index c99f535ab5..470b0fd60f 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -170,7 +170,7 @@ jobs:
           retry_wait_seconds: 30
           timeout_seconds: 900
           command: |
-            docker pull --platform ${{ matrix.platform }} ${{ matrix.base_image }}:${{ matrix.version }}
+            docker pull --platform ${{ matrix.platform }} ${{ matrix.base_image }}
             docker pull --platform ${{ matrix.platform }} netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}
       - name: Build Packages
         id: build
@@ -191,7 +191,7 @@ jobs:
         run: |
           docker run --security-opt seccomp=unconfined -e DISABLE_TELEMETRY=1 -e DISTRO=${{ matrix.distro }} \
                      -e VERSION=${{ needs.version-check.outputs.version }} -e DISTRO_VERSION=${{ matrix.version }} \
-                     --platform=${{ matrix.platform }} -v "$PWD":/netdata ${{ matrix.base_image }}:${{ matrix.version }} \
+                     --platform=${{ matrix.platform }} -v "$PWD":/netdata ${{ matrix.base_image }} \
                      /netdata/.github/scripts/pkg-test.sh
       - name: SSH setup
         id: ssh-setup
diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml
index f8a3dc4066..886fb563cc 100644
--- a/.github/workflows/repoconfig-packages.yml
+++ b/.github/workflows/repoconfig-packages.yml
@@ -86,13 +86,13 @@ jobs:
           max_attempts: 3
           retry_wait_seconds: 30
           timeout_seconds: 900
-          command: docker pull --platform ${{ matrix.platform }} ${{ matrix.base_image }}:${{ matrix.version }}
+          command: docker pull --platform ${{ matrix.platform }} ${{ matrix.base_image }}
       - name: Build Packages
         id: build
         shell: bash
         run: |
           docker run --security-opt seccomp=unconfined -e DISABLE_TELEMETRY=1 --platform ${{ matrix.platform }} \
-              -v "$PWD":/netdata ${{ matrix.base_image }}:${{ matrix.version }} \
+              -v "$PWD":/netdata ${{ matrix.base_image }} \
               /netdata/packaging/repoconfig/build-${{ matrix.format }}.sh
       - name: SSH setup
         id: ssh-setup