Merging upstream version 1.45.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 37 insertions, 21 deletions

diff --git a/.github/data/distros.yml b/.github/data/distros.yml
index 9175a5c73..811c78f07 100644
--- a/.github/data/distros.yml
+++ b/.github/data/distros.yml
@@ -30,6 +30,12 @@ include:
     test:
       ebpf-core: true
   - <<: *alpine
+    version: "3.19"
+    support_type: Core
+    notes: ''
+    eol_check: true
+    bundle_sentry: false
+  - <<: *alpine
     version: "3.18"
     support_type: Core
     notes: ''
@@ -50,6 +56,7 @@ include:
     support_type: Intermediate
     notes: ''
     eol_check: false
+    bundle_sentry: false
     env_prep: |
       pacman --noconfirm -Syu && pacman --noconfirm -Sy grep libffi
     test:
@@ -61,25 +68,31 @@ include:
     support_type: Core
     notes: ''
     eol_check: 'amazon-linux'
+    bundle_sentry: false
     packages: &amzn_packages
       type: rpm
       repo_distro: amazonlinux/2
       arches:
         - x86_64
         - aarch64
-    test:
+    test: &amzn_test
       ebpf-core: false
+      skip-local-build: true
   - <<: *amzn
     version: "2023"
     packages:
       <<: *amzn_packages
       repo_distro: amazonlinux/2023
+    test:
+      <<: *amzn_test
+      skip-local-build: false
 
   - distro: centos
     version: "7"
     support_type: Core
     notes: ''
     eol_check: false
+    bundle_sentry: false
     packages:
       type: rpm
       repo_distro: el/7
@@ -90,6 +103,7 @@ include:
         - x86_64
     test:
       ebpf-core: false
+      skip-local-build: true
 
   - &centos_stream
     distro: centos-stream
@@ -100,6 +114,7 @@ include:
     jsonc_removal: |
       dnf remove -y json-c-devel
     eol_check: true
+    bundle_sentry: false
     packages: &cs_packages
       type: rpm
       repo_distro: el/c9s
@@ -122,6 +137,7 @@ include:
     notes: ''
     base_image: debian:bookworm
     eol_check: true
+    bundle_sentry: true
     env_prep: |
       apt-get update
     jsonc_removal: |
@@ -139,6 +155,7 @@ include:
   - <<: *debian
     version: "11"
     base_image: debian:bullseye
+    bundle_sentry: false
     packages:
       <<: *debian_packages
       repo_distro: debian/bullseye
@@ -147,6 +164,7 @@ include:
   - <<: *debian
     version: "10"
     base_image: debian:buster
+    bundle_sentry: false
     packages:
       <<: *debian_packages
       repo_distro: debian/buster
@@ -159,6 +177,7 @@ include:
     support_type: Core
     notes: ''
     eol_check: true
+    bundle_sentry: false
     jsonc_removal: |
       dnf remove -y json-c-devel
     packages: &fedora_packages
@@ -176,13 +195,6 @@ include:
       repo_distro: fedora/38
     test:
       ebpf-core: true
-  - <<: *fedora
-    version: "37"
-    packages:
-      <<: *fedora_packages
-      repo_distro: fedora/37
-    test:
-      ebpf-core: true
 
   - &opensuse
     distro: opensuse
@@ -190,6 +202,7 @@ include:
     support_type: Core
     notes: ''
     eol_check: true
+    bundle_sentry: false
     base_image: opensuse/leap:15.5
     jsonc_removal: |
       zypper rm -y libjson-c-devel
@@ -201,14 +214,6 @@ include:
         - aarch64
     test:
       ebpf-core: true
-  - <<: *opensuse
-    version: "15.4"
-    support_type: Core
-    notes: ''
-    base_image: opensuse/leap:15.4
-    packages:
-      <<: *opensuse_packages
-      repo_distro: opensuse/15.4
 
   - &oracle
     distro: oraclelinux
@@ -216,6 +221,7 @@ include:
     support_type: Core
     notes: ''
     eol_check: true
+    bundle_sentry: false
     jsonc_removal: |
       dnf remove -y json-c-devel
     packages: &oracle_packages
@@ -240,6 +246,7 @@ include:
     jsonc_removal: |
       dnf remove -y json-c-devel
     eol_check: true
+    bundle_sentry: false
     packages: &rocky_packages
       type: rpm
       repo_distro: el/9
@@ -268,6 +275,7 @@ include:
     support_type: Core
     notes: ''
     eol_check: true
+    bundle_sentry: false
     env_prep: |
       rm -f /etc/apt/apt.conf.d/docker && apt-get update
     jsonc_removal: |
@@ -287,15 +295,23 @@ include:
       <<: *ubuntu_packages
       repo_distro: ubuntu/mantic
   - <<: *ubuntu
-    version: "23.04"
-    packages:
-      <<: *ubuntu_packages
-      repo_distro: ubuntu/lunar
-  - <<: *ubuntu
     version: "20.04"
     packages:
       <<: *ubuntu_packages
       repo_distro: ubuntu/focal
+legacy: # Info for platforms we used to support and still need to handle packages for
+  - <<: *fedora
+    version: "37"
+    bundle_sentry: false
+    packages:
+      <<: *fedora_packages
+      repo_distro: fedora/37
+  - <<: *opensuse
+    version: "15.4"
+    bundle_sentry: false
+    packages:
+      <<: *opensuse_packages
+      repo_distro: opensuse/15.4
 no_include: # Info for platforms not covered in CI
   - distro: docker
     version: "19.03 or newer"