MON-34952 Centreon next 24.04 (Jira release #19666#)

.github/actions/delivery/action.yml

@@ -31,12 +31,12 @@ runs:
 
     - name: Build name for DEB
       shell: bash
-      if: ${{ inputs.distrib == 'bullseye' }}
+      if: ${{ contains(fromJSON('["bullseye", "bookworm", "jammy"]'), inputs.distrib) }}
       run: |
         echo "extfile=deb" >> $GITHUB_ENV
 
     - name: Use cache files
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ./*.${{ env.extfile }}
         key: ${{ inputs.cache_key }}
@@ -46,7 +46,7 @@ runs:
         JF_URL: https://centreon.jfrog.io
         JF_ACCESS_TOKEN: ${{ inputs.artifactory_token }}
 
-    - if: ${{ startsWith(inputs.distrib, 'el') }}
+    - if: ${{ env.extfile == 'rpm' }}
       name: Publish RPMs
       run: |
         FILES="*.${{ env.extfile }}"
@@ -89,7 +89,7 @@ runs:
         done
       shell: bash
 
-    - if: ${{ inputs.distrib == 'bullseye' }}
+    - if: ${{ env.extfile == 'deb' }}
       name: Publish DEBs
       run: |
         FILES="*.${{ env.extfile }}"
@@ -113,6 +113,12 @@ runs:
 
           echo "[DEBUG] - Version: $VERSION"
 
-          jf rt upload "$FILE" "apt-standard-${{ inputs.version }}-${{ inputs.stability }}/pool/${{ inputs.module_name }}/" --deb "${{ inputs.distrib }}/main/$ARCH"
+          if [[ "${{ inputs.distrib }}" == "jammy" ]]; then
+            REPO_PREFIX="ubuntu"
+          else
+            REPO_PREFIX="apt"
+          fi
+
+          jf rt upload "$FILE" "${REPO_PREFIX}-standard-${{ inputs.version }}-${{ inputs.stability }}/pool/${{ inputs.module_name }}/" --deb "${{ inputs.distrib }}/main/$ARCH"
         done
       shell: bash

.github/actions/package/action.yml

@@ -34,6 +34,9 @@ inputs:
   rpm_gpg_signing_passphrase:
     description: The rpm gpg signing passphrase
     required: true
+  stability:
+    description: "branch stability (stable, testing, unstable, canary)"
+    required: true
 
 runs:
   using: composite
@@ -58,6 +61,11 @@ runs:
           export DIST=".${{ inputs.distrib }}"
         else
           export DIST=""
+          if [ "${{ inputs.stability }}" = "unstable" ] || [ "${{ inputs.stability }}" = "canary" ]; then
+            export RELEASE="$RELEASE~${{ inputs.distrib }}"
+          else
+            export RELEASE="1~${{ inputs.distrib }}"
+          fi
         fi
 
         export RPM_SIGNING_KEY_FILE="$(pwd)/key.gpg"
@@ -67,6 +75,9 @@ runs:
         for FILE in ${{ inputs.nfpm_file_pattern }}; do
           DIRNAME=$(dirname $FILE)
           BASENAME=$(basename $FILE)
+          if [ -f $DIRNAME/env/.env.${{ inputs.distrib }} ]; then
+            source $DIRNAME/env/.env.${{ inputs.distrib }}
+          fi
           cd $DIRNAME
           sed -i "s/@COMMIT_HASH@/${{ inputs.commit_hash }}/g" $BASENAME
           nfpm package --config $BASENAME --packager ${{ inputs.package_extension }}
@@ -76,7 +87,7 @@ runs:
       shell: bash
 
     - name: Cache packages
-      uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ./*.${{ inputs.package_extension }}
         key: ${{ inputs.cache_key }}

.github/actions/promote-to-stable/action.yml

@@ -22,6 +22,9 @@ inputs:
   repository_name:
     description: "The repository name"
     required: true
+  github_base_ref:
+    description: "Release base ref"
+    required: true
 
 runs:
   using: "composite"
@@ -41,7 +44,7 @@ runs:
 
         # Cloud specific promote
         # delivery by default to onprem, override to internal if base branch is master
-        if [[ $GITHUB_BASE_REF == "master" ]]; then
+        if [[ ${{ inputs.github_base_ref }} == "master" ]]; then
           ROOT_REPO_PATH="rpm-standard-internal"
         else
           ROOT_REPO_PATH="rpm-standard"
@@ -75,7 +78,7 @@ runs:
       shell: bash
 
     - name: Promote DEB packages to stable
-      if: ${{ startsWith(inputs.distrib, 'bullseye') }}
+      if: ${{ contains(fromJSON('["bullseye", "bookworm"]'), inputs.distrib) }}
       run: |
         echo "[DEBUG] - Major version: ${{ inputs.major_version }}"
         echo "[DEBUG] - Minor version: ${{ inputs.minor_version }}"

.github/docker/Dockerfile.centreon-collect-alma8

@@ -2,7 +2,7 @@ ARG REGISTRY_URL
 
 FROM ${REGISTRY_URL}/almalinux:8
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 # Base dnf configuration.
 echo 'http_caching=none' >> /etc/yum.conf && \
@@ -55,14 +55,16 @@ dnf install -y cmake \
 
 dnf update libarchive
 
+dnf clean all
+
 pip3 install conan==1.61.0 --prefix=/usr --upgrade
 rm -rf ~/.conan/profiles/default
 
 EOF
 
 COPY conanfile.txt .
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 cat conanfile.txt
 conan install . -s compiler.cppstd=17 -s compiler.libcxx=libstdc++11 --build=missing

.github/docker/Dockerfile.centreon-collect-alma9

@@ -2,7 +2,7 @@ ARG REGISTRY_URL
 
 FROM ${REGISTRY_URL}/almalinux:9
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 # Base dnf configuration.
 echo 'http_caching=none' >> /etc/yum.conf
@@ -48,14 +48,16 @@ dnf --best install -y cmake \
     nfpm \
     sudo
 
+dnf clean all
+
 pip3 install conan==1.61.0 --prefix=/usr --upgrade
 rm -rf ~/.conan/profiles/default
 
 EOF
 
 COPY conanfile.txt .
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 cat conanfile.txt
 conan install . -s compiler.cppstd=17 -s compiler.libcxx=libstdc++11 --build=missing

.github/docker/Dockerfile.centreon-collect-alma9-test

@@ -4,7 +4,7 @@ FROM ${REGISTRY_URL}/almalinux:9
 
 COPY . /tmp/collect
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 # Base dnf configuration.
 echo 'http_caching=none' >> /etc/yum.conf
@@ -38,6 +38,8 @@ dnf --best install -y \
     psmisc \
     sudo
 
+dnf clean all
+
 echo "install robot and dependencies"
 
 pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil

.github/docker/Dockerfile.centreon-collect-debian-bookworm

@@ -0,0 +1,59 @@
+ARG REGISTRY_URL
+
+FROM ${REGISTRY_URL}/debian:bookworm
+
+RUN bash -e <<EOF
+
+apt-get update
+
+apt-get -y install cmake \
+    git \
+    curl \
+    gcc \
+    g++ \
+    gdb \
+    pkg-config \
+    ninja-build \
+    mariadb-server \
+    openssh-server \
+    libmariadb3 \
+    librrd-dev \
+    libgnutls28-dev \
+    liblua5.3-dev \
+    python3 \
+    python3-pip \
+    libperl-dev \
+    libgcrypt20-dev \
+    aptitude \
+    fakeroot \
+    strace \
+    locales \
+    rrdtool \
+    rrdcached \
+    zstd \
+    sudo
+
+echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
+apt-get update
+apt-get install -y nfpm
+
+apt-get clean
+
+localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+
+pip3 install --break-system-packages conan==1.61.0
+ln -s /usr/local/bin/conan /usr/bin/conan
+rm -rf ~/.conan/profiles/default
+
+EOF
+
+COPY conanfile.txt .
+
+RUN bash -e <<EOF
+
+cat conanfile.txt
+conan install . -s compiler.cppstd=17 -s compiler.libcxx=libstdc++11 --build='missing'
+
+EOF
+
+WORKDIR /src

.github/docker/Dockerfile.centreon-collect-debian-bookworm-test

@@ -0,0 +1,50 @@
+ARG REGISTRY_URL
+
+FROM ${REGISTRY_URL}/debian:bookworm
+
+COPY . /tmp/collect
+
+RUN bash -e <<EOF
+
+apt-get update
+
+apt-get -y install curl \
+    gcc \
+    g++ \
+    gdb \
+    git \
+    mariadb-server \
+    openssh-server \
+    libmariadb3 \
+    librrd8 \
+    libgnutlsxx30 \
+    liblua5.3 \
+    python3 \
+    python3-dev \
+    python3-pip \
+    libperl-dev \
+    libgcrypt20 \
+    aptitude \
+    strace \
+    locales \
+    rrdtool \
+    rrdcached \
+    zstd \
+    psmisc \
+    sudo
+
+apt-get clean
+
+localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+
+pip3 install --break-system-packages -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install --break-system-packages grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3
+
+cd /tmp/collect
+
+.github/scripts/collect-prepare-test-robot.sh mariadb
+
+/bin/rm -rf /tmp/collect
+
+EOF
+

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

@@ -2,11 +2,12 @@ ARG REGISTRY_URL
 
 FROM ${REGISTRY_URL}/debian:bullseye
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 apt-get update
 
 apt-get -y install cmake \
+    git \
     curl \
     gcc \
     g++ \
@@ -23,14 +24,8 @@ apt-get -y install cmake \
     python3-pip \
     libperl-dev \
     libgcrypt20-dev \
-    dh-make \
     aptitude \
-    lintian \
-    pbuilder \
-    quilt \
     git-buildpackage \
-    debmake \
-    devscripts \
     fakeroot \
     strace \
     locales \
@@ -47,8 +42,6 @@ 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==1.61.0
 ln -s /usr/local/bin/conan /usr/bin/conan
 rm -rf ~/.conan/profiles/default
@@ -57,7 +50,7 @@ EOF
 
 COPY conanfile.txt .
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 cat conanfile.txt
 conan install . -s compiler.cppstd=17 -s compiler.libcxx=libstdc++11 --build='missing'

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

@@ -2,10 +2,9 @@ ARG REGISTRY_URL
 
 FROM ${REGISTRY_URL}/debian:bullseye
 
-
 COPY . /tmp/collect
 
-RUN <<EOF
+RUN bash -e <<EOF
 
 apt-get update
 
@@ -34,15 +33,13 @@ apt-get -y install curl \
     psmisc \
     sudo
 
-localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+apt-get clean
 
-curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-python3 get-pip.py
+localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
 pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
 pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3
 
-
 cd /tmp/collect
 
 .github/scripts/collect-prepare-test-robot.sh mariadb