diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fa12f2f70e1..8d774885215 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,15 +1,14 @@ * @centreon/owners-cpp -*.pm @centreon/owners-perl -*.pl @centreon/owners-perl - -gorgone/ @centreon/owners-perl -gorgone/docs/ @centreon/owners-doc - .github/** @centreon/owners-pipelines -**/packaging/** @centreon/owners-pipelines -**/selinux/** @centreon/owners-pipelines +packaging/** @centreon/owners-pipelines +selinux/** @centreon/owners-pipelines tests/** @centreon/owners-robot-e2e +gorgone/ @centreon/owners-perl +gorgone/docs/ @centreon/owners-doc + gorgone/tests/robot/config/ @centreon/owners-perl +*.pm @centreon/owners-perl +*.pl @centreon/owners-perl diff --git a/.github/actions/delivery/action.yml b/.github/actions/delivery/action.yml index 9b6328723e9..663b1f35549 100644 --- a/.github/actions/delivery/action.yml +++ b/.github/actions/delivery/action.yml @@ -146,7 +146,7 @@ runs: echo "[DEBUG] - stability: ${{ inputs.stability }}" # Make sure all required inputs are NOT empty - if [[ -z "${{ inputs.module_name }}" || -z "${{ inputs.distrib }}" || -z ${{ inputs.stability }} || -z ${{ inputs.major_version }} || -z "${{ inputs.is_cloud }}" || -z "${{ inputs.release_type }}" ]]; then + if [[ -z "${{ inputs.module_name }}" || -z "${{ inputs.distrib }}" || -z ${{ inputs.stability }} || -z ${{ inputs.major_version }} || -z "${{ inputs.is_cloud }}" ]]; then echo "Some mandatory inputs are empty, please check the logs." exit 1 fi diff --git a/.github/docker/Dockerfile.gorgone-testing-bookworm b/.github/docker/Dockerfile.gorgone-testing-bookworm index 8235bc2355b..79b05d0b26e 100644 --- a/.github/docker/Dockerfile.gorgone-testing-bookworm +++ b/.github/docker/Dockerfile.gorgone-testing-bookworm @@ -19,7 +19,7 @@ robotframework robotframework-examples robotframework-databaselibrary \ pymysql robotframework-requests robotframework-jsonlibrary # can't use \$() method it would be executed before the main script, and lsb_release would not be installed. -lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.05-stable/ % main' | tee /etc/apt/sources.list.d/centreon.list +lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.11-unstable/ % main' | tee /etc/apt/sources.list.d/centreon.list lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-plugins-stable/ % main' | tee /etc/apt/sources.list.d/centreon-plugins.list wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1 diff --git a/.github/docker/Dockerfile.gorgone-testing-bullseye b/.github/docker/Dockerfile.gorgone-testing-bullseye index 0c3cc92a2a8..ef72cb8a57c 100644 --- a/.github/docker/Dockerfile.gorgone-testing-bullseye +++ b/.github/docker/Dockerfile.gorgone-testing-bullseye @@ -18,7 +18,7 @@ localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 pip3 install robotframework robotframework-examples robotframework-databaselibrary \ pymysql robotframework-requests robotframework-jsonlibrary -lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.05-stable/ % main' | tee /etc/apt/sources.list.d/centreon.list +lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-standard-24.11-unstable/ % main' | tee /etc/apt/sources.list.d/centreon.list lsb_release -sc | xargs -I % sh -c 'echo deb https://packages.centreon.com/apt-plugins-stable/ % main' | tee /etc/apt/sources.list.d/centreon-plugins.list wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1 diff --git a/.github/docker/Dockerfile.gorgone-testing-jammy b/.github/docker/Dockerfile.gorgone-testing-jammy index 6338489114d..83273c050e7 100644 --- a/.github/docker/Dockerfile.gorgone-testing-jammy +++ b/.github/docker/Dockerfile.gorgone-testing-jammy @@ -11,7 +11,7 @@ RUN apt-get update && \ ENV LANG=en_US.UTF-8 # Add Centreon repositories and their public key -RUN echo "deb https://packages.centreon.com/ubuntu-standard-24.05-testing/ jammy main" | tee -a /etc/apt/sources.list.d/centreon-testing.list && \ +RUN echo "deb https://packages.centreon.com/ubuntu-standard-24.11-unstable/ jammy main" | tee -a /etc/apt/sources.list.d/centreon-testing.list && \ echo "deb https://packages.centreon.com/ubuntu-plugins-testing/ jammy main" | tee -a /etc/apt/sources.list.d/centreon-plugins-testing.list && \ wget -O- https://apt-key.centreon.com | gpg --dearmor | tee /etc/apt/trusted.gpg.d/centreon.gpg > /dev/null 2>&1 && \ apt-get update diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml index 89e9f72b439..801df40a601 100644 --- a/.github/workflows/docker-builder.yml +++ b/.github/workflows/docker-builder.yml @@ -65,10 +65,10 @@ jobs: dockerfile: centreon-collect-debian-bookworm-test image: centreon-collect-debian-bookworm-test tag: ${{ needs.get-environment.outputs.test_img_version }} - - runner: collect - dockerfile: centreon-collect-ubuntu-jammy - image: centreon-collect-ubuntu-jammy - tag: ${{ needs.get-environment.outputs.img_version }} + # - runner: collect + # dockerfile: centreon-collect-ubuntu-jammy + # image: centreon-collect-ubuntu-jammy + # tag: ${{ needs.get-environment.outputs.img_version }} - runner: collect-arm64 dockerfile: centreon-collect-debian-bullseye image: centreon-collect-debian-bullseye-arm64 diff --git a/.github/workflows/docker-gorgone-testing.yml b/.github/workflows/docker-gorgone-testing.yml index 41b42d126e4..ad7120b68c5 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, bookworm, jammy] + distrib: [alma8, alma9, bookworm] # No ubuntu in 24.10, 24.11 or later for now steps: - name: Checkout sources uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 diff --git a/.github/workflows/gorgone.yml b/.github/workflows/gorgone.yml index e7f5180762e..56051f01b60 100644 --- a/.github/workflows/gorgone.yml +++ b/.github/workflows/gorgone.yml @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [el8, el9, bookworm, jammy] + distrib: [el8, el9, bookworm] # No ubuntu in 24.10, 24.11 or later for now include: - package_extension: rpm image: packaging-nfpm-alma8 @@ -132,12 +132,13 @@ jobs: stability: ${{ needs.get-environment.outputs.stability }} test-gorgone: + if: false needs: [get-environment, package] strategy: fail-fast: false matrix: - distrib: [el8, el9, bookworm, jammy] + distrib: [el8, el9, bookworm] # No ubuntu in 24.10, 24.11 or later for now include: - package_extension: rpm image: gorgone-testing-alma8 @@ -214,9 +215,11 @@ jobs: run: | if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt update - apt install -y ./centreon-gorgone*.deb + apt install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}* else - dnf install -y ./centreon-gorgone*.rpm + 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 - name: Create databases @@ -293,7 +296,7 @@ jobs: strategy: matrix: - distrib: [bookworm, jammy] + distrib: [bookworm] # No ubuntu in 24.10, 24.11 or later for now steps: - name: Checkout sources diff --git a/.version b/.version index c041d54e063..36f30465402 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -MAJOR=24.10 +MAJOR=24.11 MINOR=0 diff --git a/CMakeLists.txt b/CMakeLists.txt index c8a1785a221..e8433be844c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ endif() # Version. set(COLLECT_MAJOR 24) -set(COLLECT_MINOR 10) +set(COLLECT_MINOR 11) 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 85b0872b544..2e4ae90da5f 100644 --- a/gorgone/packaging/centreon-gorgone-centreon-config.yaml +++ b/gorgone/packaging/centreon-gorgone-centreon-config.yaml @@ -53,17 +53,15 @@ overrides: rpm: depends: - centreon-gorgone = ${VERSION}-${RELEASE}${DIST} - - centreon-common deb: depends: - centreon-gorgone (= ${VERSION}-${RELEASE}${DIST}) - - centreon-common replaces: - - centreon-gorgone (<< 24.10.0) + - centreon-gorgone (<< 24.11.0) deb: breaks: - - centreon-gorgone (<< 24.10.0) + - centreon-gorgone (<< 24.11.0) rpm: summary: Configure Centreon Gorgone for use with Centreon Web diff --git a/gorgone/packaging/centreon-gorgone.yaml b/gorgone/packaging/centreon-gorgone.yaml index 1c11036142a..16e86d297b1 100644 --- a/gorgone/packaging/centreon-gorgone.yaml +++ b/gorgone/packaging/centreon-gorgone.yaml @@ -156,6 +156,7 @@ scripts: overrides: rpm: depends: + - centreon-common - bzip2 - perl-Libssh-Session >= 0.8 - perl-CryptX @@ -193,7 +194,8 @@ overrides: - perl(lib) - perl(Safe) deb: - depends: + depends: # those dependencies are taken from centreon-gorgone/packaging/debian/control + - centreon-common - libdatetime-perl - libtime-parsedate-perl - libtry-tiny-perl