Centreon 24.04 (Jira release #19736#)

centreon · Apr 8, 2024 · e9db77c · e9db77c
2 parents a47cfce + 2df66eb
commit e9db77c
Show file tree

Hide file tree

Showing 305 changed files with 9,759 additions and 4,292 deletions.
diff --git a/.github/actions/delivery/action.yml b/.github/actions/delivery/action.yml
@@ -19,6 +19,12 @@ inputs:
   stability:
     description: "The package stability (stable, testing, unstable)"
     required: true
+  release_type:
+    description: "Type of release (hotfix, release)"
+    required: true
+  release_cloud:
+    description: "Release context (cloud or not cloud)"
+    required: true
 
 runs:
   using: "composite"
@@ -31,12 +37,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,9 +52,11 @@ 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: |
+        set -eux
+
         FILES="*.${{ env.extfile }}"
 
         echo "[DEBUG] - Version: ${{ inputs.version }}"
@@ -64,8 +72,17 @@ runs:
           exit 1
         fi
 
+        # DEBUG
+        echo "[DEBUG] - Version: ${{ inputs.version }}"
+        echo "[DEBUG] - Distrib: ${{ inputs.distrib }}"
+        echo "[DEBUG] - module_name: ${{ inputs.module_name }}"
+        echo "[DEBUG] - release_cloud: ${{ inputs.release_cloud }}"
+        echo "[DEBUG] - release_type: ${{ inputs.release_type }}"
+
+        # Create ARCH dirs
         mkdir noarch x86_64
 
+        # Get ARCH target for files to deliver and regroupe them by ARCH
         for FILE in $FILES; do
           echo "[DEBUG] - File: $FILE"
 
@@ -76,20 +93,37 @@ runs:
           mv "$FILE" "$ARCH"
         done
 
-        for ROOT_REPO_PATH in "rpm-standard" "rpm-standard-internal"; do
+        # Build upload target path based on release_cloud and release_type values
+        # if cloud, deliver to testing-<release_type>
+        # if non-cloud, delivery to testing as usual
+        # CLOUD + HOTFIX + REPO STANDARD INTERNAL OR CLOUD + RELEASE + REPO STANDARD INTERNAL
+        if [[ ${{ inputs.release_cloud }} -eq 1 && ${{ inputs.release_type }} == "hotfix" ]] || [[ ${{ inputs.release_cloud }} -eq 1 && ${{ inputs.release_type }} == "release" ]]; then
+          ROOT_REPO_PATHS="rpm-standard-internal"
+          UPLOAD_REPO_PATH="${{ inputs.version }}/${{ inputs.distrib }}/${{ inputs.stability }}-${{ inputs.release_type }}/$ARCH/RPMS/${{ inputs.module_name }}/"
+        # NON-CLOUD + (HOTFIX OR RELEASE) + REPO STANDARD
+        elif [[ ${{ inputs.release_cloud }} -eq 0 ]]; then
+          ROOT_REPO_PATHS="rpm-standard"
+          UPLOAD_REPO_PATH="${{ inputs.version }}/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/"
+        else
+          echo "Invalid combination of release_type and release_cloud"
+          exit 1
+        fi
+
+        # Deliver based on inputs
+        for ROOT_REPO_PATH in "$ROOT_REPO_PATHS"; do
           for ARCH in "noarch" "x86_64"; do
             if [ "$(ls -A $ARCH)" ]; then
               if [ "${{ inputs.stability }}" == "stable" ]; then
-                jf rt upload "$ARCH/*.rpm" "$ROOT_REPO_PATH/${{ inputs.version }}/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/RPMS/${{ inputs.module_name }}/" --flat
+                echo "[DEBUG] - Stability is ${{ inputs.stability }}, not delivering."
               else
-                jf rt upload "$ARCH/*.rpm" "$ROOT_REPO_PATH/${{ inputs.version }}/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/" --sync-deletes="$ROOT_REPO_PATH/${{ inputs.version }}/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/" --flat
+                jf rt upload "$ARCH/*.rpm" "$ROOT_REPO_PATH/$UPLOAD_REPO_PATH" --sync-deletes="$ROOT_REPO_PATH/$UPLOAD_REPO_PATH" --flat
               fi
             fi
           done
         done
       shell: bash
 
-    - if: ${{ inputs.distrib == 'bullseye' }}
+    - if: ${{ env.extfile == 'deb' }}
       name: Publish DEBs
       run: |
         FILES="*.${{ env.extfile }}"
@@ -113,6 +147,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
diff --git a/.github/actions/package/action.yml b/.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 }}
diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml
@@ -22,34 +22,61 @@ inputs:
   repository_name:
     description: "The repository name"
     required: true
+  github_ref_name:
+    description: "Release base ref name for push event"
+    required: true
+  release_type:
+    description: "Type of release (hotfix, release)"
+    required: true
+  release_cloud:
+    description: "Release context (cloud or not cloud)"
+    required: true
 
 runs:
   using: "composite"
   steps:
-    - uses: jfrog/setup-jfrog-cli@901bb9632db90821c2d3f076012bdeaf66598555 # v3.4.1
+    - uses: jfrog/setup-jfrog-cli@26da2259ee7690e63b5410d7451b2938d08ce1f9 # v4.0.0
       env:
         JF_URL: https://centreon.jfrog.io
         JF_ACCESS_TOKEN: ${{ inputs.artifactory_token }}
 
     - name: Promote RPM packages to stable
       if: ${{ startsWith(inputs.distrib, 'el') }}
       run: |
-        set -x
+        set -eux
+
+        # DEBUG
         echo "[DEBUG] - Major version: ${{ inputs.major_version }}"
         echo "[DEBUG] - Minor version: ${{ inputs.minor_version }}"
         echo "[DEBUG] - Distrib: ${{ inputs.distrib }}"
+        echo "[DEBUG] - release_cloud: ${{ inputs.release_cloud }}"
+        echo "[DEBUG] - release_type: ${{ inputs.release_type }}"
 
         # 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"
         fi
 
+        # Search for testing packages candidate for promote
         for ARCH in "noarch" "x86_64"; do
-          echo "[DEBUG] - Get artifactory path of $ARCH testing artifacts to promote to stable."
-          SRC_PATHS=$(jf rt s --include-dirs $ROOT_REPO_PATH/${{ inputs.major_version }}/${{ inputs.distrib }}/testing/$ARCH/${{ inputs.module_name }}/*.rpm | jq -r '.[].path')
+
+          # Build search path based on release_cloud and release_type values
+          # if cloud, search in testing-<release_type> path
+          # if non-cloud, search in the testing usual path
+          if [[ ${{ inputs.release_cloud }} -eq 1 && ${{ inputs.release_type }} == "hotfix" ]] || [[ ${{ inputs.release_cloud }} -eq 1 && ${{ inputs.release_type }} == "release" ]]; then
+            SEARCH_REPO_PATH="${{ inputs.major_version }}/${{ inputs.distrib }}/testing-${{ inputs.release_type }}/$ARCH/${{ inputs.module_name }}"
+          elif [[ ${{ inputs.release_cloud }} -eq 0 ]]; then
+            SEARCH_REPO_PATH="${{ inputs.major_version }}/${{ inputs.distrib }}/testing/$ARCH/${{ inputs.module_name }}"
+          else
+            echo "Invalid combination of release_type and release_cloud"
+          fi
+
+          echo "[DEBUG] - Get path of $ARCH testing artifacts to promote to stable."
+          SRC_PATHS=$(jf rt search --include-dirs $ROOT_REPO_PATH/$SEARCH_REPO_PATH/*.rpm | jq -r '.[].path')
+
           if [[ ${SRC_PATHS[@]} ]]; then
             for SRC_PATH in ${SRC_PATHS[@]}; do
               echo "[DEBUG] - Source path found: $SRC_PATH"
@@ -58,24 +85,33 @@ runs:
             echo "[DEBUG] - No source path found."
             continue
           fi
-          echo "[DEBUG] - Build $ARCH artifactory target path."
+
+          # Build target path based on ARCH
+          echo "[DEBUG] - Build $ARCH target path."
           TARGET_PATH="$ROOT_REPO_PATH/${{ inputs.major_version }}/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/RPMS/${{ inputs.module_name }}/"
           echo "[DEBUG] - Target path: $TARGET_PATH"
+
+          # Download candidates for promote
           echo "[DEBUG] - Promoting $ARCH testing artifacts to stable."
           for ARTIFACT in ${SRC_PATHS[@]}; do
             echo "[DEBUG] - Downloading $ARTIFACT from TESTING."
             jf rt download $ARTIFACT --flat
           done
+
+          # Upload previously downloaded candidates to TARGET_PATH
           for ARTIFACT_DL in $(dir|grep -E "*.rpm"); do
             echo "[DEBUG] - Promoting (upload) $ARTIFACT_DL to stable $TARGET_PATH."
             jf rt upload "$ARTIFACT_DL" "$TARGET_PATH" --flat
           done
+
+          # Cleanup before next round of candidates
           rm -f *.rpm
         done
+
       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 }}"
@@ -106,8 +142,9 @@ runs:
         for ARTIFACT_DL in $(dir|grep -E "*.deb"); do
           ARCH=$(echo $ARTIFACT_DL | cut -d '_' -f3 | cut -d '.' -f1)
           echo "[DEBUG] - Promoting (upload) $ARTIFACT_DL to stable $TARGET_PATH."
-          jf rt upload "$ARTIFACT_DL" "$TARGET_PATH" --deb "${{ inputs.distrib }}/main/$ARCH"
+          jf rt upload "$ARTIFACT_DL" "$TARGET_PATH" --deb "${{ inputs.distrib }}/main/$ARCH" --flat
         done
 
         rm -f *.deb
+
       shell: bash