From 82ccd392022a03f7289a427edfd1bb6340845583 Mon Sep 17 00:00:00 2001 From: Boris Libert Date: Mon, 10 Aug 2026 17:27:46 +0200 Subject: [PATCH 1/3] ci(packaging): enable el10 and deb13 builds The Centreon 26.09 AMI build on AlmaLinux 10 fails because no centreon-stream-connector-* package exists for el10. Both el10 and trixie were disabled when the install/uninstall test job was added, because the Centreon 26.10 repositories were not published yet. They now exist for both distributions, so restore them in the package, test and deliver matrices of the connectors and library workflows. Two additional fixes were needed for Debian 13: - The aggregated --testing apt suite is not published for trixie, which only has testing-release and testing-hotfix. Use those instead, consistent with the rpm branch of the same action, otherwise apt-get update fails on a 404. - libcurl4 no longer exists in trixie: the 64-bit time_t transition renamed it libcurl4t64 and left no virtual package behind. Without this, 15 of the 19 connectors are uninstallable on Debian 13. The lua-* dependency workflows and docker-packaging already cover el10 and trixie, so they need no change. Refs: MON-206776 Assisted-by: Claude Code (claude-opus-5) --- .github/workflows/stream-connectors.yml | 50 ++++++++++++++----------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/.github/workflows/stream-connectors.yml b/.github/workflows/stream-connectors.yml index f4d42612..7e37653b 100644 --- a/.github/workflows/stream-connectors.yml +++ b/.github/workflows/stream-connectors.yml @@ -77,7 +77,7 @@ jobs: strategy: max-parallel: 25 matrix: - distrib: [el8, el9, bullseye, bookworm, jammy, noble] # ,el10, trixie] + distrib: [el8, el9, el10, bullseye, bookworm, trixie, jammy, noble] connector_path: ${{ fromJson(needs.detect-changes.outputs.connectors) }} include: - distrib: el8 @@ -86,18 +86,18 @@ jobs: - distrib: el9 image: packaging-stream-connectors-nfpm-alma9 package_extension: rpm -# - distrib: el10 -# image: packaging-stream-connectors-nfpm-alma10 -# package_extension: rpm + - distrib: el10 + image: packaging-stream-connectors-nfpm-alma10 + package_extension: rpm - distrib: bullseye image: packaging-stream-connectors-nfpm-bullseye package_extension: deb - distrib: bookworm image: packaging-stream-connectors-nfpm-bookworm package_extension: deb -# - distrib: trixie -# image: packaging-stream-connectors-nfpm-trixie -# package_extension: deb + - distrib: trixie + image: packaging-stream-connectors-nfpm-trixie + package_extension: deb - distrib: jammy image: packaging-stream-connectors-nfpm-jammy package_extension: deb @@ -130,26 +130,34 @@ jobs: - name: Add specific dependencies env: CONNECTOR_PATH: ${{ matrix.connector_path }} + DISTRIB: ${{ matrix.distrib }} run: | - DEB_DEPENDENCIES="libcurl4" + # Debian renamed libcurl4 to libcurl4t64 with the 64-bit time_t transition, + # and provides no libcurl4 virtual package from trixie onwards. + if [ "$DISTRIB" = "trixie" ]; then + DEB_CURL="libcurl4t64" + else + DEB_CURL="libcurl4" + fi + DEB_DEPENDENCIES="$DEB_CURL" RPM_DEPENDENCIES="libcurl" if [ "$CONNECTOR_PATH" = "elastic" ]; then DEB_DEPENDENCIES="lua-sec" RPM_DEPENDENCIES="lua-sec" elif [ "$CONNECTOR_PATH" = "influxdb" ]; then - DEB_DEPENDENCIES="libcurl4,lua-sec" + DEB_DEPENDENCIES="$DEB_CURL,lua-sec" RPM_DEPENDENCIES="libcurl,lua-sec" elif [ "$CONNECTOR_PATH" = "google" ]; then - DEB_DEPENDENCIES="libcurl4,lua-openssl" + DEB_DEPENDENCIES="$DEB_CURL,lua-openssl" RPM_DEPENDENCIES="libcurl,lua-openssl" elif [ "$CONNECTOR_PATH" = "kafka" ]; then DEB_DEPENDENCIES="librdkafka1,lua-cffi" RPM_DEPENDENCIES="librdkafka,lua-cffi" elif [ "$CONNECTOR_PATH" = "pagerduty" ]; then - DEB_DEPENDENCIES="libcurl4,lua-tz" + DEB_DEPENDENCIES="$DEB_CURL,lua-tz" RPM_DEPENDENCIES="libcurl,lua-tz" elif [ "$CONNECTOR_PATH" = "splunk" ]; then - DEB_DEPENDENCIES="libcurl4,lua-tz" + DEB_DEPENDENCIES="$DEB_CURL,lua-tz" RPM_DEPENDENCIES="libcurl,lua-tz" fi sed -i "s/@RPM_DEPENDENCIES@/$RPM_DEPENDENCIES/g;" ./packaging/connectors/centreon-stream-connectors.yaml @@ -184,7 +192,7 @@ jobs: fail-fast: false max-parallel: 25 matrix: - distrib: [el8, el9, bullseye, bookworm, jammy, noble] #, el10, trixie] + distrib: [el8, el9, el10, bullseye, bookworm, trixie, jammy, noble] connector_path: ${{ fromJson(needs.detect-changes.outputs.connectors) }} include: - distrib: el8 @@ -193,18 +201,18 @@ jobs: - distrib: el9 package_extension: rpm image: almalinux:9 -# - distrib: el10 # Centreon 26.10 repo not yet available -# package_extension: rpm -# image: almalinux:10 + - distrib: el10 + package_extension: rpm + image: almalinux:10 - distrib: bullseye package_extension: deb image: debian:bullseye - distrib: bookworm package_extension: deb image: debian:bookworm -# - distrib: trixie # Centreon 26.10 repo not yet available -# package_extension: deb -# image: debian:trixie + - distrib: trixie + package_extension: deb + image: debian:trixie - distrib: jammy package_extension: deb image: ubuntu:jammy @@ -239,7 +247,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - distrib: [el8, el9] #, el10] + distrib: [el8, el9, el10] connector_path: ${{ fromJson(needs.detect-changes.outputs.connectors) }} name: Deliver ${{ matrix.distrib }} ${{ matrix.connector_path }} @@ -262,7 +270,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - distrib: [bullseye, bookworm, jammy, noble] #, trixie] + distrib: [bullseye, bookworm, trixie, jammy, noble] connector_path: ${{ fromJson(needs.detect-changes.outputs.connectors) }} name: Deliver ${{ matrix.distrib }} ${{ matrix.connector_path }} From 8f2c55c8e2acf6a571b5ee35d0029829f51b1a07 Mon Sep 17 00:00:00 2001 From: Boris Libert Date: Mon, 10 Aug 2026 18:16:29 +0200 Subject: [PATCH 2/3] ci(packaging): scope this PR to the connectors The library and shared action changes move to their own pull request, which must land first: the connectors test job resolves centreon-stream-connectors-lib from the published repositories, and the el10 and trixie libraries published today are stale. Delivering a fresh library is a prerequisite for these tests to pass. Refs: MON-206776 Assisted-by: Claude Code (claude-opus-5) --- .github/actions/test-packages/action.yml | 9 +++---- .github/workflows/stream-connectors-lib.yml | 30 ++++++++++----------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/actions/test-packages/action.yml b/.github/actions/test-packages/action.yml index 8cde19f9..10ca4bab 100644 --- a/.github/actions/test-packages/action.yml +++ b/.github/actions/test-packages/action.yml @@ -35,7 +35,7 @@ runs: if [[ "$DISTRIB" == "el8" || "$DISTRIB" == "el9" ]]; then CENTREON_VERSION="25.10" else - CENTREON_VERSION="26.10" # el10 + CENTREON_VERSION="26.10" # el10 - repo not yet available fi # Add Centreon plugins and standard repositories cat > /etc/yum.repos.d/centreon-plugins.repo << EOF @@ -193,7 +193,7 @@ runs: new_repo_format=true elif [[ "$DISTRIB" == "trixie" ]]; then standard_base="apt-standard" - standard_distrib="${DISTRIB}-26.10" + standard_distrib="${DISTRIB}-26.10" # repo not yet available plugins_prefix="apt-plugins" new_repo_format=true fi @@ -204,10 +204,7 @@ runs: echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-stable main" | tee /etc/apt/sources.list.d/centreon-standard.list fi if [[ "$use_standard_testing" == "true" ]]; then - # The new repo format splits testing into release and hotfix suites, like the rpm one. - # The aggregated "-testing" suite only exists for bookworm and is not published for trixie. - echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-testing-release main" | tee -a /etc/apt/sources.list.d/centreon-standard.list - echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-testing-hotfix main" | tee -a /etc/apt/sources.list.d/centreon-standard.list + echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-testing main" | tee -a /etc/apt/sources.list.d/centreon-standard.list fi if [[ "$use_standard_unstable" == "true" ]]; then echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-unstable main" | tee -a /etc/apt/sources.list.d/centreon-standard.list diff --git a/.github/workflows/stream-connectors-lib.yml b/.github/workflows/stream-connectors-lib.yml index b288d4b8..826b5b61 100644 --- a/.github/workflows/stream-connectors-lib.yml +++ b/.github/workflows/stream-connectors-lib.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [el8, el9, el10, bullseye, bookworm, trixie, jammy, noble] + distrib: [el8, el9, bullseye, bookworm, jammy, noble] #, el10, trixie] include: - package_extension: rpm image: packaging-stream-connectors-nfpm-alma8 @@ -42,18 +42,18 @@ jobs: - package_extension: rpm image: packaging-stream-connectors-nfpm-alma9 distrib: el9 - - package_extension: rpm - image: packaging-stream-connectors-nfpm-alma10 - distrib: el10 +# - package_extension: rpm +# image: packaging-stream-connectors-nfpm-alma10 +# distrib: el10 - package_extension: deb image: packaging-stream-connectors-nfpm-bullseye distrib: bullseye - package_extension: deb image: packaging-stream-connectors-nfpm-bookworm distrib: bookworm - - package_extension: deb - image: packaging-stream-connectors-nfpm-trixie - distrib: trixie +# - package_extension: deb +# image: packaging-stream-connectors-nfpm-trixie +# distrib: trixie - package_extension: deb image: packaging-stream-connectors-nfpm-jammy distrib: jammy @@ -104,18 +104,18 @@ jobs: - package_extension: rpm image: almalinux:9 distrib: el9 - - package_extension: rpm - image: almalinux:10 - distrib: el10 +# - package_extension: rpm # Centreon 26.10 repo not yet available +# image: almalinux:10 +# distrib: el10 - package_extension: deb image: debian:bullseye distrib: bullseye - package_extension: deb image: debian:bookworm distrib: bookworm - - package_extension: deb - image: debian:trixie - distrib: trixie +# - package_extension: deb # Centreon 26.10 repo not yet available +# image: debian:trixie +# distrib: trixie - package_extension: deb image: ubuntu:jammy distrib: jammy @@ -150,7 +150,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - distrib: [el8, el9, el10] + distrib: [el8, el9] #, el10] name: deliver ${{ matrix.distrib }} steps: @@ -172,7 +172,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - distrib: [bullseye, bookworm, trixie, jammy, noble] + distrib: [bullseye, bookworm, jammy, noble] #, trixie] name: deliver ${{ matrix.distrib }} steps: From f57a07b61ff803e54d135f123134e808aa7c245b Mon Sep 17 00:00:00 2001 From: Boris Libert Date: Tue, 11 Aug 2026 10:26:50 +0200 Subject: [PATCH 3/3] ci(packaging): restore the lib workflow and shared action The scoping commit reverted stream-connectors-lib.yml and the test-packages action to their content at the time, which was before the library pull request landed. Replayed by the rebase on top of the current develop, it undid that pull request instead of being a no-op. Restore both files to their develop content, leaving this branch with stream-connectors.yml as its only change. Refs: MON-206776 Assisted-by: Claude Code (claude-opus-5) --- .github/actions/test-packages/action.yml | 9 ++++--- .github/workflows/stream-connectors-lib.yml | 30 ++++++++++----------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/actions/test-packages/action.yml b/.github/actions/test-packages/action.yml index 10ca4bab..8cde19f9 100644 --- a/.github/actions/test-packages/action.yml +++ b/.github/actions/test-packages/action.yml @@ -35,7 +35,7 @@ runs: if [[ "$DISTRIB" == "el8" || "$DISTRIB" == "el9" ]]; then CENTREON_VERSION="25.10" else - CENTREON_VERSION="26.10" # el10 - repo not yet available + CENTREON_VERSION="26.10" # el10 fi # Add Centreon plugins and standard repositories cat > /etc/yum.repos.d/centreon-plugins.repo << EOF @@ -193,7 +193,7 @@ runs: new_repo_format=true elif [[ "$DISTRIB" == "trixie" ]]; then standard_base="apt-standard" - standard_distrib="${DISTRIB}-26.10" # repo not yet available + standard_distrib="${DISTRIB}-26.10" plugins_prefix="apt-plugins" new_repo_format=true fi @@ -204,7 +204,10 @@ runs: echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-stable main" | tee /etc/apt/sources.list.d/centreon-standard.list fi if [[ "$use_standard_testing" == "true" ]]; then - echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-testing main" | tee -a /etc/apt/sources.list.d/centreon-standard.list + # The new repo format splits testing into release and hotfix suites, like the rpm one. + # The aggregated "-testing" suite only exists for bookworm and is not published for trixie. + echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-testing-release main" | tee -a /etc/apt/sources.list.d/centreon-standard.list + echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-testing-hotfix main" | tee -a /etc/apt/sources.list.d/centreon-standard.list fi if [[ "$use_standard_unstable" == "true" ]]; then echo "deb https://packages.centreon.com/${standard_base}/ ${standard_distrib}-unstable main" | tee -a /etc/apt/sources.list.d/centreon-standard.list diff --git a/.github/workflows/stream-connectors-lib.yml b/.github/workflows/stream-connectors-lib.yml index 826b5b61..b288d4b8 100644 --- a/.github/workflows/stream-connectors-lib.yml +++ b/.github/workflows/stream-connectors-lib.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [el8, el9, bullseye, bookworm, jammy, noble] #, el10, trixie] + distrib: [el8, el9, el10, bullseye, bookworm, trixie, jammy, noble] include: - package_extension: rpm image: packaging-stream-connectors-nfpm-alma8 @@ -42,18 +42,18 @@ jobs: - package_extension: rpm image: packaging-stream-connectors-nfpm-alma9 distrib: el9 -# - package_extension: rpm -# image: packaging-stream-connectors-nfpm-alma10 -# distrib: el10 + - package_extension: rpm + image: packaging-stream-connectors-nfpm-alma10 + distrib: el10 - package_extension: deb image: packaging-stream-connectors-nfpm-bullseye distrib: bullseye - package_extension: deb image: packaging-stream-connectors-nfpm-bookworm distrib: bookworm -# - package_extension: deb -# image: packaging-stream-connectors-nfpm-trixie -# distrib: trixie + - package_extension: deb + image: packaging-stream-connectors-nfpm-trixie + distrib: trixie - package_extension: deb image: packaging-stream-connectors-nfpm-jammy distrib: jammy @@ -104,18 +104,18 @@ jobs: - package_extension: rpm image: almalinux:9 distrib: el9 -# - package_extension: rpm # Centreon 26.10 repo not yet available -# image: almalinux:10 -# distrib: el10 + - package_extension: rpm + image: almalinux:10 + distrib: el10 - package_extension: deb image: debian:bullseye distrib: bullseye - package_extension: deb image: debian:bookworm distrib: bookworm -# - package_extension: deb # Centreon 26.10 repo not yet available -# image: debian:trixie -# distrib: trixie + - package_extension: deb + image: debian:trixie + distrib: trixie - package_extension: deb image: ubuntu:jammy distrib: jammy @@ -150,7 +150,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - distrib: [el8, el9] #, el10] + distrib: [el8, el9, el10] name: deliver ${{ matrix.distrib }} steps: @@ -172,7 +172,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - distrib: [bullseye, bookworm, jammy, noble] #, trixie] + distrib: [bullseye, bookworm, trixie, jammy, noble] name: deliver ${{ matrix.distrib }} steps: