From 20a56068b00595ceee3685ec962296474f7867fd Mon Sep 17 00:00:00 2001
From: Paul Oureib <poureib@centreon.com>
Date: Wed, 31 Jan 2024 15:16:21 +0100
Subject: [PATCH 1/6] add jammy distribution in pipelines & docker files

---
 .github/actions/promote-to-stable/action.yml  |  2 +-
 .../docker/Dockerfile.packaging-plugins-jammy | 53 +++++++++++++++++++
 .github/workflows/connector-vmware.yml        |  3 ++
 .../docker-builder-packaging-plugins.yml      |  3 ++
 .github/workflows/nrpe.yml                    |  3 ++
 .github/workflows/perl-cpan-libraries.yml     | 15 +++---
 .github/workflows/perl-crypt-argon2.yml       | 13 ++++-
 .github/workflows/perl-filesys-smbclient.yml  |  6 ++-
 .github/workflows/perl-json-path.yml          | 11 ++--
 .github/workflows/perl-keepass-reader.yml     |  6 ++-
 .github/workflows/perl-libssh-session.yml     | 13 ++++-
 .github/workflows/perl-net-curl.yml           | 13 ++++-
 .github/workflows/perl-openwsman.yml          | 20 +++++--
 .github/workflows/perl-vmware-vsphere.yml     |  5 +-
 .github/workflows/plugin-delivery.yml         |  2 +-
 .github/workflows/plugins.yml                 |  3 ++
 16 files changed, 143 insertions(+), 28 deletions(-)
 create mode 100644 .github/docker/Dockerfile.packaging-plugins-jammy

diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml
index 91f445adbd..17ee5ae43d 100644
--- a/.github/actions/promote-to-stable/action.yml
+++ b/.github/actions/promote-to-stable/action.yml
@@ -60,7 +60,7 @@ runs:
       shell: bash
 
     - name: Promote DEB package to stable
-      if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' }}
+      if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' || startsWith(inputs.disttrib, 'jammy') }}
       run: |
         echo "[DEBUG] - Distrib: ${{ inputs.distrib }}"
 
diff --git a/.github/docker/Dockerfile.packaging-plugins-jammy b/.github/docker/Dockerfile.packaging-plugins-jammy
new file mode 100644
index 0000000000..234348e1fc
--- /dev/null
+++ b/.github/docker/Dockerfile.packaging-plugins-jammy
@@ -0,0 +1,53 @@
+ARG REGISTRY_URL
+
+FROM ${REGISTRY_URL}/ubuntu:jammy
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# fix locale
+RUN bash -e <<EOF
+
+apt-get update
+apt-get install -y locales
+rm -rf /var/lib/apt/lists/*
+localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+apt-get clean
+
+EOF
+
+ENV LANG en_US.utf8
+
+RUN bash -e <<EOF
+
+apt-get update
+
+echo 'http://deb.debian.org/debian' | apt-get install -y pbuilder
+
+apt-get install -y \
+  dh-make \
+  aptitude \
+  ca-certificates \
+  libssh-dev \
+  lintian \
+  quilt \
+  git-buildpackage \
+  debmake \
+  devscripts \
+  fakeroot \
+  curl \
+  gcc \
+  git \
+  python3 \
+  libjson-perl \
+  libapp-fatpacker-perl \
+  libfile-copy-recursive-perl \
+  jq \
+  zstd
+
+echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
+apt-get update
+apt-get install -y nfpm
+
+apt-get clean
+
+EOF
diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml
index 086e405014..08afc8a8fe 100644
--- a/.github/workflows/connector-vmware.yml
+++ b/.github/workflows/connector-vmware.yml
@@ -43,6 +43,9 @@ jobs:
           - package_extension: deb
             image: packaging-plugins-bookworm
             distrib: bookworm
+          - package_extension: deb
+            image: packaging-plugins-jammy
+            distrib: jammy
 
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}
diff --git a/.github/workflows/docker-builder-packaging-plugins.yml b/.github/workflows/docker-builder-packaging-plugins.yml
index 50b7bbe9e3..f55989d4b5 100644
--- a/.github/workflows/docker-builder-packaging-plugins.yml
+++ b/.github/workflows/docker-builder-packaging-plugins.yml
@@ -40,6 +40,9 @@ jobs:
           - runner: ubuntu-22.04
             dockerfile: packaging-plugins-bookworm
             image: packaging-plugins-bookworm
+          - runner: ubuntu-22.04
+            dockerfile: packaging-plugins-jammy
+            image: packaging-plugins-jammy
 
     runs-on: ${{ matrix.runner }}
 
diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml
index 80c1090b44..e84ec58eca 100644
--- a/.github/workflows/nrpe.yml
+++ b/.github/workflows/nrpe.yml
@@ -41,6 +41,9 @@ jobs:
           - package_extension: deb
             image: packaging-plugins-bookworm
             distrib: bookworm
+          - package_extension: deb
+            image: packaging-plugins-jammy
+            distrib: jammy
 
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}
diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml
index 9b27b0ec52..aaef18d11d 100644
--- a/.github/workflows/perl-cpan-libraries.yml
+++ b/.github/workflows/perl-cpan-libraries.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distrib: [el8, el9, bullseye, bookworm]
+        distrib: [el8, el9, bullseye, bookworm, jammy]
         name:
           [
             "Authen::SASL::SASLprep",
@@ -98,7 +98,7 @@ jobs:
             "ZMQ::LibZMQ4"
           ]
         include:
-          - build_distribs: "el8,el9,bullseye,bookworm"
+          - build_distribs: "el8,el9,bullseye,bookworm,jammy"
           - rpm_dependencies: ""
           - deb_dependencies: ""
           - rpm_provides: ""
@@ -117,6 +117,9 @@ jobs:
           - distrib: bookworm
             package_extension: deb
             image: packaging-plugins-bookworm
+          - distrib: jammy
+            package_extension: deb
+            image: packaging-plugins-jammy
           - name: "BSON"
             build_distribs: "el8,el9"
             rpm_provides: "perl(BSON::Bytes) perl(BSON::Code) perl(BSON::DBRef) perl(BSON::OID) perl(BSON::Raw) perl(BSON::Regex) perl(BSON::Time) perl(BSON::Timestamp) perl(BSON::Types) perl(BSON)"
@@ -148,7 +151,7 @@ jobs:
             build_distribs: "el8,el9"
             version: "0.31"
           - name: "ZMQ::Constants"
-            build_distribs: "el9,bullseye,bookworm"
+            build_distribs: "el9,bullseye,bookworm,jammy"
           - name: "ZMQ::FFI"
             build_distribs: "el8,el9"
             rpm_dependencies: "zeromq"
@@ -306,7 +309,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
     steps:
       - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
@@ -347,7 +350,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
@@ -368,7 +371,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye, bookworm]
+        distrib: [el8, el9, bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml
index 98cdca94ab..16119fe18c 100644
--- a/.github/workflows/perl-crypt-argon2.yml
+++ b/.github/workflows/perl-crypt-argon2.yml
@@ -51,6 +51,11 @@ jobs:
             package_extension: deb
             runner: ubuntu-22.04
             arch: amd64
+          - image: packaging-plugins-jammy
+            distrib: jammy
+            package_extension: deb
+            runner: ubuntu-22.04
+            arch: amd64
           - image: packaging-plugins-bullseye-arm64
             distrib: bullseye
             package_extension: deb
@@ -73,7 +78,7 @@ jobs:
 
       - name: Install locally Crypt::Argon2
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             apt-get update
             apt-get install -y cpanminus gcc
           else
@@ -85,7 +90,7 @@ jobs:
 
       - name: Set package name and paths according to distrib
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             NAME="libcrypt-argon2-perl"
             if [ "${{ matrix.arch }}" = "amd64" ]; then
               PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
@@ -165,6 +170,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -198,6 +205,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml
index 6b5edbbae2..31a55e4343 100644
--- a/.github/workflows/perl-filesys-smbclient.yml
+++ b/.github/workflows/perl-filesys-smbclient.yml
@@ -120,6 +120,8 @@ jobs:
             distrib: bullseye
           - image: packaging-plugins-bookworm
             distrib: bookworm
+          - image: packaging-plugins-jammy
+            distrib: jammy
     name: package ${{ matrix.distrib }}
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest
@@ -174,7 +176,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
@@ -195,7 +197,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye, bookworm]
+        distrib: [el8, el9, bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml
index 6a9e7034b8..f70f824243 100644
--- a/.github/workflows/perl-json-path.yml
+++ b/.github/workflows/perl-json-path.yml
@@ -41,6 +41,9 @@ jobs:
           - image: packaging-plugins-bookworm
             distrib: bookworm
             package_extension: deb
+          - image: packaging-plugins-jammy
+            distrib: jammy
+            package_extension: deb
 
     runs-on: ubuntu-22.04
 
@@ -58,7 +61,7 @@ jobs:
 
       - name: Install locally JSON::Path
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             apt-get update
             apt-get install -y cpanminus gcc
           else
@@ -75,7 +78,7 @@ jobs:
       - name: Set package name and paths according to distrib
         run: |
           VERSION="1.0.3"
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             NAME="libjson-path-perl"
             PERL_VENDORLIB="/usr/share/perl5"
           else
@@ -148,7 +151,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     name: Deliver ${{ matrix.distrib }}
 
@@ -171,7 +174,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml
index f653ed14c8..af794c6967 100644
--- a/.github/workflows/perl-keepass-reader.yml
+++ b/.github/workflows/perl-keepass-reader.yml
@@ -122,6 +122,8 @@ jobs:
             distrib: bullseye
           - image: bookworm
             distrib: bookworm
+          - image: jammy
+            distrib: jammy
     name: package ${{ matrix.distrib }}
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/packaging-plugins-${{ matrix.image }}:latest
@@ -182,7 +184,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
@@ -203,7 +205,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye, bookworm]
+        distrib: [el8, el9, bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml
index 9e3b801490..d25ffa6ff5 100644
--- a/.github/workflows/perl-libssh-session.yml
+++ b/.github/workflows/perl-libssh-session.yml
@@ -49,6 +49,11 @@ jobs:
             package_extension: deb
             runner: ubuntu-22.04
             arch: amd64
+          - image: packaging-plugins-jammy
+            distrib: jammy
+            package_extension: deb
+            runner: ubuntu-22.04
+            arch: amd64
           - image: packaging-plugins-bullseye-arm64
             distrib: bullseye
             package_extension: deb
@@ -71,7 +76,7 @@ jobs:
 
       - name: Install locally Libssh::Session
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" || [ "${{ matrix.distrib }}" = "jammy" ]; then
             apt-get update
             apt-get install -y cpanminus gcc libssh-dev
           else
@@ -83,7 +88,7 @@ jobs:
 
       - name: Set package name and paths according to distrib
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             NAME="libssh-session-perl"
             if [ "${{ matrix.arch }}" = "amd64" ]; then
               PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
@@ -165,6 +170,8 @@ jobs:
             arch: arm64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
 
     name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }}
 
@@ -196,6 +203,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml
index d042506b1b..326b518091 100644
--- a/.github/workflows/perl-net-curl.yml
+++ b/.github/workflows/perl-net-curl.yml
@@ -49,6 +49,11 @@ jobs:
             package_extension: deb
             runner: ubuntu-22.04
             arch: amd64
+          - image: packaging-plugins-jammy
+            distrib: jammy
+            package_extension: deb
+            runner: ubuntu-22.04
+            arch: amd64
           - image: packaging-plugins-bullseye-arm64
             distrib: bullseye
             package_extension: deb
@@ -71,7 +76,7 @@ jobs:
 
       - name: Install locally Net::Curl
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]  || [ "${{ matrix.distrib }}" = "jammy" ]; then
             apt-get update
             apt-get install -y libcurl4-openssl-dev cpanminus gcc
           else
@@ -83,7 +88,7 @@ jobs:
 
       - name: Set package name and paths according to distrib
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]  || [ "${{ matrix.distrib }}" = "jammy" ]; then
             NAME="libnet-curl-perl"
             if [ "${{ matrix.arch }}" = "amd64" ]; then
               PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
@@ -163,6 +168,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -196,6 +203,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml
index 3c58af5afe..82b188f2ce 100644
--- a/.github/workflows/perl-openwsman.yml
+++ b/.github/workflows/perl-openwsman.yml
@@ -51,6 +51,12 @@ jobs:
             runner: ubuntu-22.04
             arch: amd64
             version: 2.7.2
+          - image: packaging-plugins-jammy
+            distrib: jammy
+            package_extension: deb
+            runner: ubuntu-22.04
+            arch: amd64
+            version: 2.7.2
           - image: packaging-plugins-bullseye-arm64
             distrib: bullseye
             package_extension: deb
@@ -74,7 +80,7 @@ jobs:
 
       - name: Install locally sblim-sfcc
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             apt-get update
             apt-get install -y libcurl4-openssl-dev
             cd /tmp
@@ -97,7 +103,7 @@ jobs:
 
       - name: Build openwsman
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             apt-get install -y cmake libssl-dev libpam-dev swig libxml2-dev
           else
             dnf install -y wget cmake gcc-c++ libcurl-devel pam-devel swig libxml2-devel openssl-devel
@@ -113,7 +119,7 @@ jobs:
 
       - name: Set package name and paths according to distrib
         run: |
-          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
+          if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
             NAME_PERL="libopenwsman-perl"
             USRLIB="/usr/lib/"
             if [ "${{ matrix.arch }}" = "amd64" ]; then
@@ -144,7 +150,7 @@ jobs:
         shell: bash
 
       - name: Package sblim-sfcc
-        if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' }}
+        if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' || matrix.distrib == 'jammy' }}
         uses: ./.github/actions/package-nfpm
         with:
           nfpm_file_pattern: "dependencies/perl-openwsman/sblim-sfcc.yaml"
@@ -237,6 +243,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -288,6 +296,8 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
+          - distrib: jammy
+            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -296,7 +306,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Promote sblim-sfcc ${{ matrix.distrib }} ${{ matrix.arch }} to stable
-        if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' }}
+        if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' || matrix.distrib == 'jammy' }}
         uses: ./.github/actions/promote-to-stable
         with:
           artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml
index 9dd6821d47..0a234d3299 100644
--- a/.github/workflows/perl-vmware-vsphere.yml
+++ b/.github/workflows/perl-vmware-vsphere.yml
@@ -64,6 +64,9 @@ jobs:
           - package_extension: deb
             image: packaging-plugins-bookworm
             distrib: bookworm
+          - package_extension: deb
+            image: packaging-plugins-jammy
+            distrib: jammy
 
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}
@@ -130,7 +133,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml
index be4919159b..dd9509bd6e 100644
--- a/.github/workflows/plugin-delivery.yml
+++ b/.github/workflows/plugin-delivery.yml
@@ -96,7 +96,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 078dd312d9..02e1553eb1 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -132,6 +132,9 @@ jobs:
           - package_extension: deb
             image: packaging-plugins-bookworm
             distrib: bookworm
+          - package_extension: deb
+            image: packaging-plugins-jammy
+            distrib: jammy
 
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}

From d108b4e56e4a27fa467b75f07c1186debc200457 Mon Sep 17 00:00:00 2001
From: Paul Oureib <poureib@centreon.com>
Date: Wed, 31 Jan 2024 16:48:38 +0100
Subject: [PATCH 2/6] scinded rpm and deb packaging to tackle 256 github build
 processes limit

---
 .github/workflows/perl-cpan-libraries.yml | 132 ++++++++++++++++++----
 1 file changed, 110 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml
index aaef18d11d..ae125a7020 100644
--- a/.github/workflows/perl-cpan-libraries.yml
+++ b/.github/workflows/perl-cpan-libraries.yml
@@ -22,7 +22,7 @@ jobs:
   get-environment:
     uses: ./.github/workflows/get-environment.yml
 
-  package:
+  package-rpm:
     needs: [get-environment]
     if: ${{ needs.get-environment.outputs.stability != 'stable' }}
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distrib: [el8, el9, bullseye, bookworm, jammy]
+        distrib: [el8, el9]
         name:
           [
             "Authen::SASL::SASLprep",
@@ -98,9 +98,8 @@ jobs:
             "ZMQ::LibZMQ4"
           ]
         include:
-          - build_distribs: "el8,el9,bullseye,bookworm,jammy"
+          - build_distribs: "el8,el9"
           - rpm_dependencies: ""
-          - deb_dependencies: ""
           - rpm_provides: ""
           - version: ""
           - use_dh_make_perl: "true"
@@ -111,15 +110,6 @@ jobs:
           - distrib: el9
             package_extension: rpm
             image: packaging-plugins-alma9
-          - distrib: bullseye
-            package_extension: deb
-            image: packaging-plugins-bullseye
-          - distrib: bookworm
-            package_extension: deb
-            image: packaging-plugins-bookworm
-          - distrib: jammy
-            package_extension: deb
-            image: packaging-plugins-jammy
           - name: "BSON"
             build_distribs: "el8,el9"
             rpm_provides: "perl(BSON::Bytes) perl(BSON::Code) perl(BSON::DBRef) perl(BSON::OID) perl(BSON::Raw) perl(BSON::Regex) perl(BSON::Time) perl(BSON::Timestamp) perl(BSON::Types) perl(BSON)"
@@ -151,7 +141,7 @@ jobs:
             build_distribs: "el8,el9"
             version: "0.31"
           - name: "ZMQ::Constants"
-            build_distribs: "el9,bullseye,bookworm,jammy"
+            build_distribs: "el9"
           - name: "ZMQ::FFI"
             build_distribs: "el8,el9"
             rpm_dependencies: "zeromq"
@@ -159,7 +149,6 @@ jobs:
             use_dh_make_perl: "false"
             version: "0.01"
             rpm_dependencies: "zeromq"
-            deb_dependencies: "libzmq5"
     name: package ${{ matrix.distrib }} ${{ matrix.name }}
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest
@@ -170,7 +159,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.package_extension == 'rpm' }}
+      - if: ${{ contains(matrix.build_distribs, matrix.distrib) }}
         run: |
           yum install -y yum-utils epel-release git
           yum config-manager --set-enabled crb || true # alma 9
@@ -178,7 +167,7 @@ jobs:
           yum install -y cpanminus rpm-build libcurl-devel libssh-devel expat-devel gcc ruby libuuid-devel zeromq-devel libxml2-devel libffi-devel perl-DBI perl-Net-Pcap freetds freetds-devel
         shell: bash
 
-      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.package_extension == 'rpm' && matrix.spec_file == '' }}
+      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.spec_file == '' }}
         run: |
           if [ -z "${{ matrix.version }}" ]; then
             PACKAGE_VERSION=""
@@ -211,7 +200,7 @@ jobs:
           fpm -s cpan -t ${{ matrix.package_extension }} --rpm-dist ${{ matrix.distrib }} --verbose --cpan-verbose --no-cpan-test$PACKAGE_DEPENDENCIES$PACKAGE_PROVIDES$PACKAGE_VERSION ${{ matrix.name }}
         shell: bash
 
-      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.package_extension == 'rpm' && matrix.spec_file != '' }}
+      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.spec_file != '' }}
         run: |
           mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 
@@ -220,7 +209,106 @@ jobs:
           cp -r ~/rpmbuild/RPMS/noarch/*.rpm .
         shell: bash
 
-      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.package_extension == 'deb' && matrix.use_dh_make_perl == 'false' }}
+  package-deb:
+    needs: [get-environment]
+    if: ${{ needs.get-environment.outputs.stability != 'stable' }}
+
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        distrib: [bullseye, bookworm, jammy]
+        name:
+          [
+            "Authen::SASL::SASLprep",
+            "Authen::SCRAM::Client",
+            "boolean",
+            "Carp::Assert",
+            "Clone",
+            "Clone::Choose",
+            "common::sense",
+            "Convert::EBCDIC",
+            "Crypt::Blowfish_PP",
+            "DateTime::Format::Duration::ISO8601",
+            "Device::Modbus",
+            "Digest::MD5::File",
+            "Digest::SHA1",
+            "Email::Send::SMTP::Gmail",
+            "FFI::CheckLib",
+            "File::SearchPath",
+            "Hash::Merge",
+            "Hash::Ordered",
+            "HTTP::Daemon",
+            "HTTP::Daemon::SSL",
+            "HTTP::ProxyPAC",
+            "JMX::Jmx4Perl",
+            "JSON::Parse",
+            "JSON::WebToken",
+            "LV",
+            "MIME::Types",
+            "MongoDB",
+            "Net::FTPSSL",
+            "Net::HTTPTunnel",
+            "Net::NTP",
+            "Net::SMTPS",
+            "Net::SMTP_auth",
+            "Net::Subnet",
+            "Net::TFTP",
+            "PBKDF2::Tiny",
+            "Schedule::Cron",
+            "Statistics::Descriptive",
+            "Statistics::Regression",
+            "Sys::SigAction",
+            "Term::Clui",
+            "Term::ShellUI",
+            "Unicode::Stringprep",
+            "URI::Encode",
+            "URI::Template",
+            "URL::Encode",
+            "UUID::URandom",
+            "WWW::Selenium",
+            "XML::Filter::BufferText",
+            "XML::LibXML::Simple",
+            "XML::SAX::Writer",
+            "ZMQ::Constants",
+            "ZMQ::LibZMQ4"
+          ]
+        include:
+          - build_distribs: "bullseye,bookworm,jammy"
+          - deb_dependencies: ""
+          - rpm_provides: ""
+          - version: ""
+          - use_dh_make_perl: "true"
+          - spec_file: ""
+          - distrib: bullseye
+            package_extension: deb
+            image: packaging-plugins-bullseye
+          - distrib: bookworm
+            package_extension: deb
+            image: packaging-plugins-bookworm
+          - distrib: jammy
+            package_extension: deb
+            image: packaging-plugins-jammy
+          - name: "DateTime::Format::Duration::ISO8601"
+          - name: "Statistics::Regression"
+            version: "0.53"
+          - name: "ZMQ::Constants"
+            build_distribs: "bullseye,bookworm,jammy"
+          - name: "ZMQ::LibZMQ4"
+            use_dh_make_perl: "false"
+            version: "0.01"
+            deb_dependencies: "libzmq5"
+    name: package ${{ matrix.distrib }} ${{ matrix.name }}
+    container:
+      image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest
+      credentials:
+        username: ${{ secrets.DOCKER_REGISTRY_ID }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWD }}
+
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.use_dh_make_perl == 'false' }}
         run: |
           apt update
           apt install -y cpanminus ruby libcurl4-openssl-dev libssh-dev uuid-dev libczmq-dev
@@ -247,7 +335,7 @@ jobs:
           fpm -s cpan -t ${{ matrix.package_extension }} --deb-dist ${{ matrix.distrib }} --verbose --cpan-verbose --no-cpan-test -n $PACKAGE_NAME$PACKAGE_DEPENDENCIES$PACKAGE_VERSION ${{ matrix.name }}
         shell: bash
 
-      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.package_extension == 'deb' && matrix.use_dh_make_perl == 'true' }}
+      - if: ${{ contains(matrix.build_distribs, matrix.distrib) && matrix.use_dh_make_perl == 'true' }}
         run: |
           apt update
           apt install -y cpanminus libcurl4-openssl-dev dh-make-perl libssh-dev uuid-dev libczmq-dev libmodule-install-perl
@@ -268,7 +356,7 @@ jobs:
           retention-days: 1
 
   sign-rpm:
-    needs: [package]
+    needs: [package-rpm]
 
     runs-on: ubuntu-22.04
     strategy:
@@ -305,7 +393,7 @@ jobs:
           key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }}
 
   download-and-cache-deb:
-    needs: [package]
+    needs: [package-deb]
     runs-on: ubuntu-22.04
     strategy:
       matrix:

From 1bb5866a534432c8cb665db22669cccbcd7b609a Mon Sep 17 00:00:00 2001
From: Kevin Duret <kduret@centreon.com>
Date: Thu, 1 Feb 2024 14:48:39 +0100
Subject: [PATCH 3/6] fix

---
 .github/workflows/perl-cpan-libraries.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml
index ae125a7020..2c67fbd55f 100644
--- a/.github/workflows/perl-cpan-libraries.yml
+++ b/.github/workflows/perl-cpan-libraries.yml
@@ -111,26 +111,19 @@ jobs:
             package_extension: rpm
             image: packaging-plugins-alma9
           - name: "BSON"
-            build_distribs: "el8,el9"
             rpm_provides: "perl(BSON::Bytes) perl(BSON::Code) perl(BSON::DBRef) perl(BSON::OID) perl(BSON::Raw) perl(BSON::Regex) perl(BSON::Time) perl(BSON::Timestamp) perl(BSON::Types) perl(BSON)"
           - name: "BSON::XS"
-            build_distribs: "el8,el9"
           - name: "Convert::Binary::C"
-            build_distribs: "el8,el9"
           - name: "DateTime::Format::Duration::ISO8601"
             rpm_provides: "perl(DateTime-Format-Duration-ISO8601)"
           - name: "DBD::Sybase"
-            build_distribs: "el8,el9"
           - name: "Device::Modbus::RTU::Client"
             version: "0.022"
           - name: "Device::Modbus::TCP::Client"
             version: "0.026"
           - name: "EV"
-            build_distribs: "el8,el9"
           - name: "FFI::CheckLib"
-            build_distribs: "el8,el9"
           - name: "FFI::Platypus"
-            build_distribs: "el8,el9"
             rpm_provides: "perl(FFI::Platypus::Buffer) perl(FFI::Platypus::Memory)"
           - name: "Net::DHCP"
             rpm_provides: "perl(Net::DHCP::Constants) perl(Net::DHCP::Packet)"
@@ -138,12 +131,10 @@ jobs:
             version: "0.53"
           - name: "UUID"
             use_dh_make_perl: "false"
-            build_distribs: "el8,el9"
             version: "0.31"
           - name: "ZMQ::Constants"
             build_distribs: "el9"
           - name: "ZMQ::FFI"
-            build_distribs: "el8,el9"
             rpm_dependencies: "zeromq"
           - name: "ZMQ::LibZMQ4"
             use_dh_make_perl: "false"
@@ -209,6 +200,12 @@ jobs:
           cp -r ~/rpmbuild/RPMS/noarch/*.rpm .
         shell: bash
 
+      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        with:
+          name: packages-${{ matrix.package_extension }}-${{ matrix.distrib }}
+          path: ./*.${{ matrix.package_extension }}
+          retention-days: 1
+
   package-deb:
     needs: [get-environment]
     if: ${{ needs.get-environment.outputs.stability != 'stable' }}
@@ -293,7 +290,6 @@ jobs:
           - name: "Statistics::Regression"
             version: "0.53"
           - name: "ZMQ::Constants"
-            build_distribs: "bullseye,bookworm,jammy"
           - name: "ZMQ::LibZMQ4"
             use_dh_make_perl: "false"
             version: "0.01"
@@ -387,7 +383,7 @@ jobs:
       - run: rpmsign --addsign ./*.rpm
         shell: bash
 
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      - uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ./*.rpm
           key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }}

From b696348b638dea4fae50cd081e5cbf64faa8cd6d Mon Sep 17 00:00:00 2001
From: Kevin Duret <kduret@centreon.com>
Date: Thu, 1 Feb 2024 14:59:50 +0100
Subject: [PATCH 4/6] remove jammy delivery

---
 .github/actions/promote-to-stable/action.yml | 2 +-
 .github/workflows/perl-cpan-libraries.yml    | 4 ++--
 .github/workflows/perl-crypt-argon2.yml      | 4 ----
 .github/workflows/perl-filesys-smbclient.yml | 4 ++--
 .github/workflows/perl-json-path.yml         | 4 ++--
 .github/workflows/perl-keepass-reader.yml    | 4 ++--
 .github/workflows/perl-libssh-session.yml    | 4 ----
 .github/workflows/perl-net-curl.yml          | 4 ----
 .github/workflows/perl-openwsman.yml         | 4 ----
 .github/workflows/perl-vmware-vsphere.yml    | 2 +-
 .github/workflows/plugin-delivery.yml        | 2 +-
 11 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml
index 17ee5ae43d..91f445adbd 100644
--- a/.github/actions/promote-to-stable/action.yml
+++ b/.github/actions/promote-to-stable/action.yml
@@ -60,7 +60,7 @@ runs:
       shell: bash
 
     - name: Promote DEB package to stable
-      if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' || startsWith(inputs.disttrib, 'jammy') }}
+      if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' }}
       run: |
         echo "[DEBUG] - Distrib: ${{ inputs.distrib }}"
 
diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml
index 2c67fbd55f..c5a642184e 100644
--- a/.github/workflows/perl-cpan-libraries.yml
+++ b/.github/workflows/perl-cpan-libraries.yml
@@ -434,7 +434,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     steps:
       - name: Checkout sources
@@ -455,7 +455,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye, bookworm, jammy]
+        distrib: [el8, el9, bullseye, bookworm]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml
index 4e281bb133..224ceb4c38 100644
--- a/.github/workflows/perl-crypt-argon2.yml
+++ b/.github/workflows/perl-crypt-argon2.yml
@@ -172,8 +172,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -207,8 +205,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml
index 31a55e4343..9518008e14 100644
--- a/.github/workflows/perl-filesys-smbclient.yml
+++ b/.github/workflows/perl-filesys-smbclient.yml
@@ -176,7 +176,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     steps:
       - name: Checkout sources
@@ -197,7 +197,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye, bookworm, jammy]
+        distrib: [el8, el9, bullseye, bookworm]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml
index 5c9b554c55..04cbd59e9f 100644
--- a/.github/workflows/perl-json-path.yml
+++ b/.github/workflows/perl-json-path.yml
@@ -153,7 +153,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     name: Deliver ${{ matrix.distrib }}
 
@@ -176,7 +176,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml
index af794c6967..634bd1b540 100644
--- a/.github/workflows/perl-keepass-reader.yml
+++ b/.github/workflows/perl-keepass-reader.yml
@@ -184,7 +184,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     steps:
       - name: Checkout sources
@@ -205,7 +205,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye, bookworm, jammy]
+        distrib: [el8, el9, bullseye, bookworm]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml
index 663a13b69b..bf0c20f3ab 100644
--- a/.github/workflows/perl-libssh-session.yml
+++ b/.github/workflows/perl-libssh-session.yml
@@ -172,8 +172,6 @@ jobs:
             arch: arm64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
 
     name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }}
 
@@ -205,8 +203,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml
index 83547316c3..d4be259d2f 100644
--- a/.github/workflows/perl-net-curl.yml
+++ b/.github/workflows/perl-net-curl.yml
@@ -170,8 +170,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -205,8 +203,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml
index b948eda3a4..711a996eb4 100644
--- a/.github/workflows/perl-openwsman.yml
+++ b/.github/workflows/perl-openwsman.yml
@@ -249,8 +249,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
@@ -302,8 +300,6 @@ jobs:
             arch: amd64
           - distrib: bookworm
             arch: amd64
-          - distrib: jammy
-            arch: amd64
           - distrib: bullseye
             arch: arm64
 
diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml
index caa7d2da15..964ded427b 100644
--- a/.github/workflows/perl-vmware-vsphere.yml
+++ b/.github/workflows/perl-vmware-vsphere.yml
@@ -134,7 +134,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml
index dd9509bd6e..be4919159b 100644
--- a/.github/workflows/plugin-delivery.yml
+++ b/.github/workflows/plugin-delivery.yml
@@ -96,7 +96,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distrib: [bullseye, bookworm, jammy]
+        distrib: [bullseye, bookworm]
 
     steps:
       - name: Checkout sources

From 9b422d83581cac3d79c2944800e4fad611a52c30 Mon Sep 17 00:00:00 2001
From: May <110405507+paul-oureib@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:51:53 +0100
Subject: [PATCH 5/6] Update .github/docker/Dockerfile.packaging-plugins-jammy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com>
---
 .github/docker/Dockerfile.packaging-plugins-jammy | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/docker/Dockerfile.packaging-plugins-jammy b/.github/docker/Dockerfile.packaging-plugins-jammy
index 234348e1fc..633d9cd527 100644
--- a/.github/docker/Dockerfile.packaging-plugins-jammy
+++ b/.github/docker/Dockerfile.packaging-plugins-jammy
@@ -19,11 +19,10 @@ ENV LANG en_US.utf8
 
 RUN bash -e <<EOF
 
-apt-get update
-
-echo 'http://deb.debian.org/debian' | apt-get install -y pbuilder
+echo 'http://deb.debian.org/debian' | apt-get update
 
 apt-get install -y \
+  pbuilder \
   dh-make \
   aptitude \
   ca-certificates \

From 301037a720f2b3ca7b9847fab13037ccce5f5533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Chapron?=
 <34628915+sc979@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:55:32 +0100
Subject: [PATCH 6/6] Update .github/docker/Dockerfile.packaging-plugins-jammy

---
 .github/docker/Dockerfile.packaging-plugins-jammy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/docker/Dockerfile.packaging-plugins-jammy b/.github/docker/Dockerfile.packaging-plugins-jammy
index 633d9cd527..234348e1fc 100644
--- a/.github/docker/Dockerfile.packaging-plugins-jammy
+++ b/.github/docker/Dockerfile.packaging-plugins-jammy
@@ -19,10 +19,11 @@ ENV LANG en_US.utf8
 
 RUN bash -e <<EOF
 
-echo 'http://deb.debian.org/debian' | apt-get update
+apt-get update
+
+echo 'http://deb.debian.org/debian' | apt-get install -y pbuilder
 
 apt-get install -y \
-  pbuilder \
   dh-make \
   aptitude \
   ca-certificates \