mon-147204 Sync Centreon next 23.10 (#1732)

centreon · Oct 1, 2024 · 775e356 · 775e356
2 parents 0e1e26e + 37902e3
commit 775e356
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 deletions.
diff --git a/.github/actions/package-legacy/action.yml b/.github/actions/package-legacy/action.yml
@@ -158,7 +158,7 @@ runs:
         debmake -f "Centreon" -e "[email protected]" -u "$VERSION" -y -r "bullseye"
         debuild-pbuilder --no-lintian
 
-        # This makes shure that widget pkgs end up in the same dir as non widgets
+        # This makes sure that widget pkgs end up in the same dir as non widgets
         if [[ $MODULE_BASENAME = "centreon-widget"* ]]; then
           find / -name "*centreon-widget*.deb" -exec mv {} ../../ \;
         fi

diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml
@@ -74,7 +74,6 @@ runs:
 
         MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 )
         MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 )
-        BUMP_MAJOR_RIGHT=$(( MAJOR_RIGHT_PART + 1 ))
         if [ "$MAJOR_RIGHT" = "04" ]; then
           BUMP_MAJOR_LEFT="$MAJOR_LEFT"
           BUMP_MAJOR_RIGHT="10"
@@ -115,5 +114,5 @@ runs:
       uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
       with:
         name: ${{ inputs.arch != '' && format('packages-{0}-{1}', inputs.distrib, inputs.arch) || format('packages-{0}', inputs.distrib) }}
-        path: ./*.${{ inputs.package_extension}}
+        path: ./*.${{ inputs.package_extension }}
         retention-days: 1
diff --git a/.github/docker/Dockerfile.centreon-collect-alma8 b/.github/docker/Dockerfile.centreon-collect-alma8
@@ -19,7 +19,7 @@ baseurl=https://repo.goreleaser.com/yum/
 enabled=1
 gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo
 
-curl -LsS "https://r.mariadb.com/downloads/mariadb_repo_setup" | bash -s -- --os-type=rhel --os-version=8 --mariadb-server-version="mariadb-10.5"
+curl -LsS "https://r.mariadb.com/downloads/mariadb_repo_setup" | bash -s -- --os-type=rhel --os-version=8 --mariadb-server-version="mariadb-10.5" --skip-maxscale
 dnf --best install -y cmake \
     gcc \
     gcc-c++ \

diff --git a/.github/workflows/gorgone.yml b/.github/workflows/gorgone.yml
@@ -79,7 +79,7 @@ jobs:
       spec_file: gorgone/packaging/centreon-gorgone.spectemplate
       package_extension: ${{ matrix.package_extension }}
       image_name: ${{ matrix.image }}
-      module_name: centreon-gorgone
+      module_name: gorgone
       major_version: ${{ needs.get-version.outputs.major_version }}
       minor_version: ${{ needs.get-version.outputs.minor_version }}
       release: ${{ needs.get-version.outputs.release }}

diff --git a/.version b/.version
@@ -1,2 +1,2 @@
 MAJOR=23.10
-MINOR=10
+MINOR=11
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,7 +122,7 @@ endif()
 # Version.
 set(COLLECT_MAJOR 23)
 set(COLLECT_MINOR 10)
-set(COLLECT_PATCH 10)
+set(COLLECT_PATCH 11)
 set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${COLLECT_VERSION}\")
 

diff --git a/gorgone/.version b/gorgone/.version
@@ -1 +1 @@
-MINOR=8
+MINOR=10
diff --git a/gorgone/packaging/centreon-gorgone.spectemplate b/gorgone/packaging/centreon-gorgone.spectemplate
@@ -1,15 +1,15 @@
 %define selinuxdevel %{_datadir}/selinux/devel
 
 Name:       centreon-gorgone
-Version:    23.10.8
+Version:    23.10.10
 Release:    %{PACKAGE_RELEASE}%{?dist}
 Summary:    Perl daemon task handlers
 Group:      Applications/System
 License:    Apache-2.0
 URL:        http://www.centreon.com
-Source0:    %{name}-%{version}.tar.gz
+Source0:    gorgone-%{version}.tar.gz
 BuildArch:  noarch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:  %{_tmppath}/gorgone-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: perl-devel
 
@@ -43,6 +43,7 @@ Requires:   perl(Clone)
 Requires:   perl(Sys::Syslog)
 Requires:   perl(DateTime)
 Requires:   perl(Try::Tiny)
+Requires:   perl(lib)
 Requires:   tar
 AutoReqProv: no
 
@@ -71,7 +72,7 @@ Requires:   centreon-common-selinux
 SElinux context for centreon-gorgoned.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n gorgone-%{version}
 
 %build
 

diff --git a/gorgone/packaging/debian/centreon-gorgone.install b/gorgone/packaging/debian/centreon-gorgone.install
@@ -10,8 +10,8 @@ gorgone/class/*                          usr/share/perl5/gorgone/class
 gorgone/modules/*                        usr/share/perl5/gorgone/modules
 gorgone/standard/*                       usr/share/perl5/gorgone/standard
 
-packaging/action.yaml => etc/centreon-gorgone/config.d/39-action.yaml
-packaging/centreon.yaml => etc/centreon-gorgone/config.d/30-centreon.yaml
-packaging/centreon-audit.yaml => etc/centreon-gorgone/config.d/50-centreon-audit.yaml
-config/systemd/gorgoned-service => lib/systemd/system/gorgoned.service
-config/systemd/gorgoned-sysconfig => etc/default/gorgoned
+packaging/action.yaml => /etc/centreon-gorgone/config.d/39-action.yaml
+packaging/centreon.yaml => /etc/centreon-gorgone/config.d/30-centreon.yaml
+packaging/centreon-audit.yaml => /etc/centreon-gorgone/config.d/50-centreon-audit.yaml
+config/systemd/gorgoned-service => /lib/systemd/system/gorgoned.service
+config/systemd/gorgoned-sysconfig => /etc/default/gorgoned
diff --git a/gorgone/packaging/debian/control b/gorgone/packaging/debian/control
@@ -1,4 +1,4 @@
-Source: centreon-gorgone
+Source: gorgone
 Section: net
 Priority: optional
 Maintainer: Centreon <[email protected]>
@@ -40,6 +40,7 @@ Depends:
   libev-perl,
   libzmq-ffi-perl,
   libclone-choose-perl,
+  perl-base,
   sudo,
   ${shlibs:Depends},
   ${misc:Depends}