diff --git a/.github/workflows/centreon-collect.yml b/.github/workflows/centreon-collect.yml index d0c6f70cd30..a643a420bfa 100644 --- a/.github/workflows/centreon-collect.yml +++ b/.github/workflows/centreon-collect.yml @@ -131,7 +131,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [alma8, alma9, debian-bullseye, debian-bookworm] + distrib: [alma8, alma9, debian-bookworm] runs-on: [self-hosted, collect] @@ -255,11 +255,6 @@ jobs: package_extension: rpm runner: collect arch: amd64 - - image: centreon-collect-debian-bullseye - distrib: bullseye - package_extension: deb - runner: collect - arch: amd64 - image: centreon-collect-debian-bookworm distrib: bookworm package_extension: deb @@ -270,11 +265,6 @@ jobs: package_extension: deb runner: collect arch: amd64 - - image: centreon-collect-debian-bullseye-arm64 - distrib: bullseye - package_extension: deb - runner: collect-arm64 - arch: arm64 - image: centreon-collect-debian-bookworm-arm64 distrib: bookworm package_extension: deb @@ -324,13 +314,6 @@ jobs: database_type: mysql test_group_name: robot_test-mysql-el9-amd64 tests_params: '{}' - - distrib: bullseye - image: centreon-collect-debian-bullseye-arm64-test - package_extension: deb - arch: arm64 - database_type: mariadb - test_group_name: robot_test-mariadb-bullseye-arm64 - tests_params: '{}' - distrib: bookworm image: centreon-collect-debian-bookworm-arm64-test package_extension: deb @@ -448,10 +431,6 @@ jobs: strategy: matrix: include: - - distrib: bullseye - arch: amd64 - - distrib: bullseye - arch: arm64 - distrib: bookworm arch: amd64 - distrib: jammy @@ -485,7 +464,7 @@ jobs: runs-on: [self-hosted, common] strategy: matrix: - distrib: [el8, el9, bullseye, bookworm, jammy] + distrib: [el8, el9, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/docker-gorgone-testing.yml b/.github/workflows/docker-gorgone-testing.yml index 6b8aa098d81..45f71466c5f 100644 --- a/.github/workflows/docker-gorgone-testing.yml +++ b/.github/workflows/docker-gorgone-testing.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: - distrib: [alma8, alma9, bullseye, bookworm, jammy] + distrib: [alma8, alma9, bookworm, jammy] steps: - name: Checkout sources uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/gorgone.yml b/.github/workflows/gorgone.yml index c8aa71efdee..683b24a278b 100644 --- a/.github/workflows/gorgone.yml +++ b/.github/workflows/gorgone.yml @@ -61,7 +61,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [el8, el9, bullseye, bookworm, jammy] + distrib: [el8, el9, bookworm, jammy] include: - package_extension: rpm image: packaging-nfpm-alma8 @@ -69,9 +69,6 @@ jobs: - package_extension: rpm image: packaging-nfpm-alma9 distrib: el9 - - package_extension: deb - image: packaging-nfpm-bullseye - distrib: bullseye - package_extension: deb image: packaging-nfpm-bookworm distrib: bookworm @@ -139,7 +136,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [el8, el9, bullseye, bookworm, jammy] + distrib: [el8, el9, bookworm, jammy] include: - package_extension: rpm image: gorgone-testing-alma8 @@ -147,9 +144,6 @@ jobs: - package_extension: rpm image: gorgone-testing-alma9 distrib: el9 - - package_extension: deb - image: gorgone-testing-bullseye - distrib: bullseye - package_extension: deb image: gorgone-testing-jammy distrib: jammy @@ -208,14 +202,20 @@ jobs: key: ${{ github.sha }}-${{ github.run_id }}-${{ matrix.package_extension }}-${{ matrix.distrib }} fail-on-cache-miss: true - - name: Install gorgogne from just built package + - name: Parse distrib name + id: parse-distrib + uses: ./.github/actions/parse-distrib + with: + distrib: ${{ matrix.distrib }} + + - name: Install gorgone from just built package shell: bash run: | if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt update - apt install -y ./centreon-gorgone*${{ matrix.distrib }}* + apt install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}* else - dnf install -y ./centreon-gorgone*${{ matrix.distrib }}* ./centreon-gorgone-centreon-config*${{ matrix.distrib }}* + dnf install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}* ./centreon-gorgone-centreon-config*${{ steps.parse-distrib.outputs.package_distrib_name }}* # in el8 at least, there is a package for the configuration and a package for the actual code. # this is not the case for debian, and for now I don't know why it was made any different between the 2 Os. fi @@ -294,7 +294,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm, jammy] + distrib: [bookworm, jammy] steps: - name: Checkout sources @@ -322,7 +322,7 @@ jobs: runs-on: [self-hosted, common] strategy: matrix: - distrib: [el8, el9, bullseye, bookworm] + distrib: [el8, el9, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/libzmq.yml b/.github/workflows/libzmq.yml index 34dd31bbef9..1f927f19139 100644 --- a/.github/workflows/libzmq.yml +++ b/.github/workflows/libzmq.yml @@ -79,10 +79,6 @@ jobs: fail-fast: false matrix: include: - - image: packaging-nfpm-bullseye - distrib: bullseye - runner: ubuntu-22.04 - arch: amd64 - image: packaging-nfpm-bookworm distrib: bookworm runner: ubuntu-22.04 @@ -91,10 +87,6 @@ jobs: distrib: jammy runner: ubuntu-22.04 arch: amd64 - - image: packaging-bullseye-arm64 - distrib: bullseye - runner: ["self-hosted", "collect-arm64"] - arch: arm64 runs-on: ${{ matrix.runner }} @@ -184,10 +176,6 @@ jobs: strategy: matrix: include: - - distrib: bullseye - arch: amd64 - - distrib: bullseye - arch: arm64 - distrib: bookworm arch: amd64 - distrib: jammy @@ -221,7 +209,7 @@ jobs: runs-on: [self-hosted, common] strategy: matrix: - distrib: [el8, el9, bullseye, bookworm, jammy] + distrib: [el8, el9, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/lua-curl.yml b/.github/workflows/lua-curl.yml index ef22e7259f7..7c03702634d 100644 --- a/.github/workflows/lua-curl.yml +++ b/.github/workflows/lua-curl.yml @@ -47,12 +47,6 @@ jobs: lua_version: 5.4 runner: ubuntu-24.04 arch: amd64 - - package_extension: deb - image: centreon-collect-debian-bullseye - distrib: bullseye - lua_version: 5.3 - runner: ubuntu-24.04 - arch: amd64 - package_extension: deb image: centreon-collect-debian-bookworm distrib: bookworm @@ -65,12 +59,6 @@ jobs: lua_version: 5.3 runner: ubuntu-24.04 arch: amd64 - - package_extension: deb - image: centreon-collect-debian-bullseye-arm64 - distrib: bullseye - lua_version: 5.3 - runner: ["self-hosted", "collect-arm64"] - arch: arm64 - package_extension: deb image: centreon-collect-debian-bookworm-arm64 distrib: bookworm @@ -176,10 +164,6 @@ jobs: strategy: matrix: include: - - distrib: bullseye - arch: amd64 - - distrib: bullseye - arch: arm64 - distrib: bookworm arch: amd64 - distrib: jammy @@ -212,7 +196,7 @@ jobs: runs-on: [self-hosted, common] strategy: matrix: - distrib: [el8, el9, bullseye, bookworm] + distrib: [el8, el9, bookworm] steps: - name: Checkout sources diff --git a/.version b/.version index db9a189ef29..c041d54e063 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -MAJOR=24.09 +MAJOR=24.10 MINOR=0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 51319732e2a..c8a1785a221 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ endif() # Version. set(COLLECT_MAJOR 24) -set(COLLECT_MINOR 09) +set(COLLECT_MINOR 10) set(COLLECT_PATCH 0) set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}") diff --git a/gorgone/packaging/centreon-gorgone-centreon-config.yaml b/gorgone/packaging/centreon-gorgone-centreon-config.yaml index 1a8d3a48ce6..b6485a84883 100644 --- a/gorgone/packaging/centreon-gorgone-centreon-config.yaml +++ b/gorgone/packaging/centreon-gorgone-centreon-config.yaml @@ -57,11 +57,11 @@ overrides: depends: - centreon-gorgone (= ${VERSION}-${RELEASE}${DIST}) replaces: - - centreon-gorgone (<< 24.09.0) + - centreon-gorgone (<< 24.10.0) deb: breaks: - - centreon-gorgone (<< 24.09.0) + - centreon-gorgone (<< 24.10.0) rpm: summary: Configure Centreon Gorgone for use with Centreon Web