chore(ci): deliver to unstable after nightly robot

.github/actions/get-packages/action.yml

@@ -28,7 +28,7 @@ runs:
   steps:
     - name: Build name for RPM
       shell: bash
-      if: ${{ inputs.distrib == 'el7' || inputs.distrib == 'el8' }}
+      if: ${{ startsWith(inputs.distrib, 'el') }}
       run: |
         echo "build=rpmbuild-centreon-collect" >> $GITHUB_ENV
         echo "extfile=rpm" >> $GITHUB_ENV
@@ -72,7 +72,7 @@ runs:
         echo "[DEBUG] - RELEASE: $RELEASE"
 
         # Obtain latest version.patch-release
-        PKG_DIR_VERSION=$(curl -s "https://yum.centreon.com/standard/23.04/el7/unstable/x86_64/centreon-collect/" | sed -En 's/.*([2-9][0-9]\.[0-9][0-9]\.[[:digit:]]+-[[:digit:]]+\.[[a-z0-9]{7}).*/\1/p')
+        PKG_DIR_VERSION=$(curl -s "https://yum.centreon.com/standard/23.04/${{ inputs.distrib }}/unstable/x86_64/centreon-collect/" | sed -En 's/.*([2-9][0-9]\.[0-9][0-9]\.[[:digit:]]+-[[:digit:]]+\.[[a-z0-9]{7}).*/\1/p')
 
         echo "[DEBUG] - PKG_DIR_VERSION: $PKG_DIR_VERSION"
 

.github/actions/package-sign/action.yml

@@ -33,4 +33,4 @@ runs:
         password: ${{ inputs.password }}
 
     - run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" centreon.jfrog.io/docker/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }}
-      shell: bash
+      shell: bash

.github/docker/Dockerfile.collect-alma8

@@ -1,20 +1,23 @@
 FROM almalinux:8
 
+RUN <<EOF
+
 # Base dnf configuration.
-RUN echo 'http_caching=none' >> /etc/yum.conf && \
-    echo 'assumeyes=1' >> /etc/yum.conf && \
-    sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf && \
-    dnf install -y dnf-plugins-core
-RUN dnf config-manager --set-enabled powertools
+echo 'http_caching=none' >> /etc/yum.conf && \
+echo 'assumeyes=1' >> /etc/yum.conf && \
+sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf && \
+dnf install -y dnf-plugins-core
+dnf config-manager --set-enabled powertools
 
-RUN dnf install -y epel-release
+dnf install -y epel-release
 
-RUN curl -LsS "https://r.mariadb.com/downloads/mariadb_repo_setup" | bash -s -- --os-type=rhel --os-version=8 --mariadb-server-version="mariadb-10.5"
-RUN dnf install -y cmake \
+curl -LsS "https://r.mariadb.com/downloads/mariadb_repo_setup" | bash -s -- --os-type=rhel --os-version=8 --mariadb-server-version="mariadb-10.5"
+dnf install -y cmake \
     gcc \
     gcc-c++ \
     gettext \
     git \
+    ninja-build \
     MariaDB-devel \
     MariaDB-shared \
     MariaDB-client \
@@ -35,13 +38,23 @@ RUN dnf install -y cmake \
     rrdtool-devel \
     yum-utils \
     perl \
-    rpm-build
-RUN dnf update libarchive
+    rpm-build \
+    zstd
+
+dnf update libarchive
+
+pip3 install conan --prefix=/usr --upgrade
+rm -rf ~/.conan/profiles/default
+
+EOF
 
-RUN pip3 install conan --prefix=/usr --upgrade
-RUN rm -rf ~/.conan/profiles/default
 COPY conanfile.txt .
-RUN cat conanfile.txt
-RUN conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build=missing
+
+RUN <<EOF
+
+cat conanfile.txt
+conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build=missing
+
+EOF
 
 WORKDIR /src

.github/docker/Dockerfile.collect-alma9

@@ -16,6 +16,7 @@ dnf install -y cmake \
     gcc-c++ \
     gettext \
     git \
+    ninja-build \
     mariadb-server \
     mariadb \
     gnutls-devel \
@@ -32,7 +33,8 @@ dnf install -y cmake \
     yum-utils \
     perl \
     rpm-build \
-    procps-ng
+    procps-ng \
+    zstd
 
 pip3 install conan --prefix=/usr --upgrade
 rm -rf ~/.conan/profiles/default

.github/docker/Dockerfile.collect-debian-bullseye

@@ -1,6 +1,10 @@
 FROM debian:bullseye
-RUN apt-get -y update && \
-    apt-get -y install cmake \
+
+RUN <<EOF
+
+apt-get -y update
+
+apt-get -y install cmake \
     curl \
     gcc \
     g++ \
@@ -9,7 +13,6 @@ RUN apt-get -y update && \
     libmariadb3 \
     librrd-dev \
     libgnutls28-dev \
-    ninja-build \
     liblua5.3-dev \
     python3 \
     python3-pip \
@@ -25,15 +28,28 @@ RUN apt-get -y update && \
     devscripts \
     fakeroot \
     strace \
-    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
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-RUN python3 get-pip.py
-RUN pip3 install conan
-RUN ln -s /usr/local/bin/conan /usr/bin/conan
-RUN rm -rf ~/.conan/profiles/default
+    locales \
+    zstd
+
+apt-get clean
+
+localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+python3 get-pip.py
+pip3 install conan
+ln -s /usr/local/bin/conan /usr/bin/conan
+rm -rf ~/.conan/profiles/default
+
+EOF
+
 COPY conanfile.txt .
-RUN cat conanfile.txt
-RUN conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build='missing'
+
+RUN <<EOF
+
+cat conanfile.txt
+conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build='missing'
+
+EOF
+
 WORKDIR /src

ci/scripts/collect-deb-package.sh → .github/scripts/collect-deb-package.sh

@@ -23,16 +23,10 @@ if [ -d "$ROOT/build" ] ; then
 fi
 tar --exclude={".git","build"} -czpf $ROOT-$VERSION.tar.gz "$ROOT"
 cd "$ROOT"
-cp -r ci/debian debian
+cp -r packaging/debian debian
 
 sed -i "s/^centreon:version=.*$/centreon:version=$(echo $VERSION-$RELEASE)/" debian/substvars
-echo "debmake begin"
+
 debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -u "$VERSION" -r "$RELEASE"
-echo "version de dwz"
-/usr/bin/dwz -v
-echo "version de gcc"
-gcc --version
-echo "version de ld"
-ld --version
+
 debuild-pbuilder
-cd ../

.github/scripts/collect-rpm-package.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+if [ -z "$VERSION" -o -z "$RELEASE" -o -z "$DISTRIB" ] ; then
+  echo "You need to specify VERSION / RELEASE / DISTRIB variables"
+  exit 1
+fi
+
+if [ ! -d ~/rpmbuild/SOURCES ] ; then
+    mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+fi
+
+tar czf ~/rpmbuild/SOURCES/centreon-collect-$VERSION.tar.gz \
+      --exclude './build' \
+      --exclude './.git'  \
+      --transform "s,^\.,centreon-collect-$VERSION," .
+
+cp packaging/rpm/centreonengine_integrate_centreon_engine2centreon.sh ~/rpmbuild/SOURCES/
+
+rpmbuild -ba packaging/rpm/centreon-collect.spec -D "VERSION $VERSION" -D "RELEASE $RELEASE"
+
+cp -r ~/rpmbuild/RPMS/x86_64/*.rpm .

ci/scripts/collect-test-robot.sh → .github/scripts/collect-test-robot.sh

@@ -11,7 +11,8 @@ ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -P ""
 /usr/sbin/sshd > /dev/null 2>&1 &
 
 echo "########################### Start MariaDB ######################################"
-mariadbd --user=root > /dev/null 2>&1 &
+mysql_install_db --user=root --basedir=/usr --datadir=/var/lib/mysql
+mariadbd --socket=/var/lib/mysql/mysql.sock --user=root > /dev/null 2>&1 &
 sleep 5
 
 echo "########################### Init centreon database ############################"
@@ -29,37 +30,23 @@ echo "Installation..."
 /usr/bin/rpm -Uvvh --force --nodeps *.rpm
 
 echo "########################### Install Robot Framework ###########################"
-cd /src/tests/
+cd tests
 pip3 install -U robotframework robotframework-databaselibrary pymysql python-dateutil
 
 yum groupinstall "Development Tools" -y
 yum install python3-devel -y
 
-# Get OS version id
-VERSION_ID=$(grep '^VERSION_ID' /etc/os-release | sed -En 's/^VERSION_ID="([[:digit:]])\.[[:digit:]]"/\1/p')
-
-# Force version for el7 only
-if [ -f /etc/os-release ]; then
-    case "$VERSION_ID" in
-        7)
-            pip3 install grpcio==1.33.2 grpcio_tools==1.33.2
-            ;;
-        8)
-            pip3 install grpcio grpcio_tools
-            ;;
-        *)
-            echo "OS Version is neither 7 or 8"
-            ;;
-    esac
-fi
+pip3 install grpcio grpcio_tools
 
+echo "##### site-packages #####"
+find / -name site-packages
+
+echo "##### grpc #####"
+find / -name grpc
+
+echo "##### Starting tests #####"
 ./init-proto.sh
 
 echo "####################### Run Centreon Collect Robot Tests #######################"
-cd /src/tests/
-robot --nostatusrc .
-
-echo "########################### Generate Folder Report #############################"
-mkdir reports
-cp log.html output.xml report.html reports
+robot $1
 

.github/scripts/collect-unit-tests.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+#Cmake
+rm -rf /src/build
+mkdir /src/build
+cd /src/build/
+
+conan install .. -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build=missing
+if [ $(cat /etc/issue | awk '{print $1}') = "Debian" ] ; then
+    CXXFLAGS="-Wall -Wextra" cmake -G "Ninja" -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DWITH_CENTREON_CLIB_INCLUDE_DIR=../clib/inc/ -DWITH_CENTREON_CLIB_LIBRARIES=centreon-clib/libcentreon_clib.so -DCMAKE_BUILD_TYPE=Debug -DWITH_PREFIX=/usr -DWITH_PREFIX_BIN=/usr/sbin -DWITH_USER_BROKER=centreon-broker -DWITH_USER_ENGINE=centreon-engine -DWITH_GROUP_BROKER=centreon-broker -DWITH_GROUP_ENGINE=centreon-engine -DWITH_TESTING=On -DWITH_PREFIX_MODULES=/usr/share/centreon/lib/centreon-broker -DWITH_PREFIX_CONF_BROKER=/etc/centreon-broker -DWITH_PREFIX_LIB_BROKER=/usr/lib64/nagios -DWITH_PREFIX_CONF_ENGINE=/etc/centreon-engine -DWITH_PREFIX_LIB_ENGINE=/usr/lib64/centreon-engine -DWITH_PREFIX_LIB_CLIB=/usr/lib64/ -DWITH_RW_DIR=/var/lib/centreon-engine/rw -DWITH_VAR_DIR=/var/log/centreon-engine -DWITH_MODULE_SIMU=On ..
+else
+    CXXFLAGS="-Wall -Wextra" cmake3 -G "Ninja" -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DWITH_CENTREON_CLIB_INCLUDE_DIR=../clib/inc/ -DWITH_CENTREON_CLIB_LIBRARIES=centreon-clib/libcentreon_clib.so -DCMAKE_BUILD_TYPE=Debug -DWITH_PREFIX=/usr -DWITH_PREFIX_BIN=/usr/sbin -DWITH_USER_BROKER=centreon-broker -DWITH_USER_ENGINE=centreon-engine -DWITH_GROUP_BROKER=centreon-broker -DWITH_GROUP_ENGINE=centreon-engine -DWITH_TESTING=On -DWITH_PREFIX_MODULES=/usr/share/centreon/lib/centreon-broker -DWITH_PREFIX_CONF_BROKER=/etc/centreon-broker -DWITH_PREFIX_LIB_BROKER=/usr/lib64/nagios -DWITH_PREFIX_CONF_ENGINE=/etc/centreon-engine -DWITH_PREFIX_LIB_ENGINE=/usr/lib64/centreon-engine -DWITH_PREFIX_LIB_CLIB=/usr/lib64/ -DWITH_RW_DIR=/var/lib/centreon-engine/rw -DWITH_VAR_DIR=/var/log/centreon-engine -DWITH_MODULE_SIMU=On ..
+fi
+
+#Build
+ninja -j 8
+ninja -j 8 install
+
+#Test
+
+tests/ut_broker --gtest_output=xml:ut_broker.xml
+tests/ut_engine --gtest_output=xml:ut_engine.xml
+tests/ut_clib --gtest_output=xml:ut_clib.xml
+tests/ut_connector --gtest_output=xml:ut_connector.xml
+echo "----------------------------------------------------------   end of ut tests ------------------------------------------------"