fix(ci): fix installation path of perl libraries (#4913)

Refs: MON-35359
centreon · May 28, 2024 · 9f2dd4a · 9f2dd4a
1 parent 61bc01f
commit 9f2dd4a
Show file tree

Hide file tree

Showing 27 changed files with 242 additions and 158 deletions.
diff --git a/.github/actions/deb-delivery-legacy/action.yml b/.github/actions/deb-delivery-legacy/action.yml
@@ -30,7 +30,7 @@ runs:
         key: ${{ inputs.cache_key }}
         fail-on-cache-miss: true
 
-    - 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 }}

diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml
@@ -34,7 +34,7 @@ runs:
         fail-on-cache-miss: true
 
     - if: ${{ ! (inputs.distrib == 'jammy' && inputs.stability == 'stable') }}
-      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 }}

diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml
@@ -17,7 +17,7 @@ inputs:
 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 }}

diff --git a/.github/actions/rpm-delivery-legacy/action.yml b/.github/actions/rpm-delivery-legacy/action.yml
@@ -30,7 +30,7 @@ runs:
         key: ${{ inputs.cache_key }}
         fail-on-cache-miss: true
 
-    - 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 }}

diff --git a/.github/actions/rpm-delivery/action.yml b/.github/actions/rpm-delivery/action.yml
@@ -31,7 +31,7 @@ runs:
         key: ${{ inputs.cache_key }}
         fail-on-cache-miss: true
 
-    - 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 }}

diff --git a/.github/actions/runner-docker/action.yml b/.github/actions/runner-docker/action.yml
diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml
@@ -25,8 +25,8 @@ jobs:
       version_file: connectors/vmware/src/centreon/script/centreon_vmware.pm
 
   package:
-    needs:
-      - get-environment
+    needs: [get-environment]
+    if: ${{ needs.get-environment.outputs.stability != 'stable' }}
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -66,7 +66,7 @@ jobs:
           distrib: ${{ matrix.distrib }}
           package_extension: ${{ matrix.package_extension }}
           version: ${{ needs.get-environment.outputs.version }}
-          release: ${{ needs.get-environment.outputs.release }}
+          release: 1
           commit_hash: ${{ github.sha }}
           cache_key: ${{ github.sha }}-${{ github.run_id }}-${{ matrix.package_extension }}-${{ matrix.distrib }}
           rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }}
@@ -75,10 +75,8 @@ jobs:
           stability: ${{ needs.get-environment.outputs.stability }}
 
   deliver-rpm:
-    needs:
-      - get-environment
-      - package
-    if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }}
+    needs: [get-environment, package]
+    if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }}
     runs-on: [self-hosted, common]
 
     strategy:
@@ -99,10 +97,8 @@ jobs:
           artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
 
   deliver-deb:
-    needs:
-      - get-environment
-      - package
-    if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }}
+    needs: [get-environment, package]
+    if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }}
     runs-on: [self-hosted, common]
 
     strategy:
@@ -121,3 +117,23 @@ jobs:
           cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }}
           stability: ${{ needs.get-environment.outputs.stability }}
           artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
+
+  promote:
+    needs: [get-environment]
+    if: ${{ contains(fromJson('["stable"]'), needs.get-environment.outputs.stability) }}
+    runs-on: [self-hosted, common]
+    strategy:
+      matrix:
+        distrib: [el8, el9, bullseye, bookworm]
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Promote ${{ matrix.distrib }} to stable
+        uses: ./.github/actions/promote-to-stable
+        with:
+          artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}
+          module: connector-vmware
+          distrib: ${{ matrix.distrib }}
+          stability: ${{ needs.get-environment.outputs.stability }}
diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml
@@ -26,6 +26,7 @@ jobs:
 
   package:
     needs: [get-environment]
+    if: ${{ needs.get-environment.outputs.stability != 'stable' }}
 
     strategy:
       fail-fast: false
@@ -85,24 +86,28 @@ jobs:
             dnf install -y cpanminus gcc
           fi
 
-          cpanm -v -l /tmp Crypt::Argon2@0.019
+          cpanm -v -l /tmp Crypt::Argon2@0.020
         shell: bash
 
       - name: Set package name and paths according to distrib
         run: |
+          PERL_VERSION=$(perl -E "say $^V" | sed -E "s/v([0-9]+\.[0-9]+).+/\1/g")
+
+          echo "Perl version is $PERL_VERSION"
+
           if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
             NAME="libcrypt-argon2-perl"
             if [ "${{ matrix.arch }}" = "amd64" ]; then
-              PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
+              PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl/$PERL_VERSION"
             else
-              PERL_VENDORARCH="/usr/lib/aarch64-linux-gnu/perl5/5.32"
+              PERL_VENDORARCH="/usr/lib/aarch64-linux-gnu/perl/$PERL_VERSION"
             fi
           else
             NAME="perl-Crypt-Argon2"
             if [ "${{ matrix.distrib }}" = "el8" ]; then
               PERL_VENDORARCH="/usr/local/lib64/perl5"
             else
-              PERL_VENDORARCH="/usr/local/lib64/perl5/5.32"
+              PERL_VENDORARCH="/usr/local/lib64/perl5/$PERL_VERSION"
             fi
           fi
 
@@ -119,7 +124,7 @@ jobs:
           distrib: ${{ matrix.distrib }}
           package_extension: ${{ matrix.package_extension }}
           arch: ${{ matrix.arch }}
-          release: 3
+          release: 1
           commit_hash: ${{ github.sha }}
           cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}
           rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }}

diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml
@@ -118,6 +118,10 @@ jobs:
         include:
           - image: packaging-plugins-bullseye
             distrib: bullseye
+          - image: packaging-plugins-bookworm
+            distrib: bookworm
+          - image: packaging-plugins-jammy
+            distrib: jammy
     name: package ${{ matrix.distrib }}
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest
@@ -135,7 +139,7 @@ jobs:
           mv dependencies/perl-filesys-smbclient/src/ perl-filesys-smbclient
           tar czf perl-filesys-smbclient.tar.gz perl-filesys-smbclient
 
-          DEB_BUILD_OPTIONS="nocheck nodocs notest noautodbgsym" dh-make-perl make --verbose --build --version 4.0-${{ matrix.distrib }} perl-filesys-smbclient/
+          DEB_BUILD_OPTIONS="nocheck nodocs notest noautodbgsym" dh-make-perl make --dist ${{ matrix.distrib }} --verbose --build --version 4.0-${{ matrix.distrib }} perl-filesys-smbclient/
         shell: bash
 
       - uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
@@ -172,7 +176,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye]
+        distrib: [bullseye, bookworm, jammy]
 
     steps:
       - name: Checkout sources
@@ -193,7 +197,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [el8, el9, bullseye]
+        distrib: [el8, el9, bullseye, bookworm]
 
     steps:
       - name: Checkout sources

diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml
@@ -24,6 +24,7 @@ jobs:
 
   package:
     needs: [get-environment]
+    if: ${{ needs.get-environment.outputs.stability != 'stable' }}
 
     strategy:
       fail-fast: false
@@ -78,6 +79,11 @@ jobs:
       - name: Set package name and paths according to distrib
         run: |
           VERSION="1.0.4"
+
+          PERL_VERSION=$(perl -E "say $^V" | sed -E "s/v([0-9]+\.[0-9]+).+/\1/g")
+
+          echo "Perl version is $PERL_VERSION"
+
           if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
             NAME="libjson-path-perl"
             PERL_VENDORLIB="/usr/share/perl5"
@@ -87,7 +93,7 @@ jobs:
               VERSION="0.5" # https://github.com/centreon/centreon-plugins/issues/4540
               PERL_VENDORLIB="/usr/local/share/perl5"
             else
-              PERL_VENDORLIB="/usr/local/share/perl5/5.32"
+              PERL_VENDORLIB="/usr/local/share/perl5/$PERL_VERSION"
             fi
           fi
 
@@ -153,7 +159,7 @@ jobs:
 
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [bullseye, bookworm, jammy]
 
     name: Deliver ${{ matrix.distrib }}
 
@@ -176,7 +182,7 @@ jobs:
     runs-on: [self-hosted, common]
     strategy:
       matrix:
-        distrib: [bullseye, bookworm]
+        distrib: [el8, el9, bullseye, bookworm]
 
     steps:
       - name: Checkout sources

diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml
@@ -79,6 +79,10 @@ jobs:
 
       - name: Set package name and paths according to distrib
         run: |
+          PERL_VERSION=$(perl -E "say $^V" | sed -E "s/v([0-9]+\.[0-9]+).+/\1/g")
+
+          echo "Perl version is $PERL_VERSION"
+
           if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
             NAME="libkeepass-reader-perl"
             PERL_VENDORLIB="/usr/share/perl5"
@@ -87,7 +91,7 @@ jobs:
             if [[ "${{ matrix.distrib }}" == "el8" ]]; then
               PERL_VENDORLIB="/usr/local/share/perl5"
             else
-              PERL_VENDORLIB="/usr/local/share/perl5/5.32"
+              PERL_VENDORLIB="/usr/local/share/perl5/$PERL_VERSION"
             fi
           fi
 
@@ -104,7 +108,7 @@ jobs:
           distrib: ${{ matrix.distrib }}
           package_extension: ${{ matrix.package_extension }}
           version: "0.2"
-          release: "2"
+          release: "3"
           arch: all
           commit_hash: ${{ github.sha }}
           cache_key: cache-${{ github.run_id }}-${{ matrix.package_extension }}-${{ env.module_name }}-${{ matrix.distrib }}

diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml
@@ -24,6 +24,7 @@ jobs:
 
   package:
     needs: [get-environment]
+    if: ${{ needs.get-environment.outputs.stability != 'stable' }}
 
     strategy:
       fail-fast: false
@@ -88,19 +89,23 @@ jobs:
 
       - name: Set package name and paths according to distrib
         run: |
+          PERL_VERSION=$(perl -E "say $^V" | sed -E "s/v([0-9]+\.[0-9]+).+/\1/g")
+
+          echo "Perl version is $PERL_VERSION"
+
           if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
             NAME="libssh-session-perl"
             if [ "${{ matrix.arch }}" = "amd64" ]; then
-              PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
+              PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl/$PERL_VERSION"
             else
-              PERL_VENDORARCH="/usr/lib/aarch64-linux-gnu/perl5/5.32"
+              PERL_VENDORARCH="/usr/lib/aarch64-linux-gnu/perl/$PERL_VERSION"
             fi
           else
             NAME="perl-Libssh-Session"
             if [ "${{ matrix.distrib }}" = "el8" ]; then
               PERL_VENDORARCH="/usr/local/lib64/perl5"
             else
-              PERL_VENDORARCH="/usr/local/lib64/perl5/5.32"
+              PERL_VENDORARCH="/usr/local/lib64/perl5/$PERL_VERSION"
             fi
           fi
 
@@ -117,7 +122,7 @@ jobs:
           distrib: ${{ matrix.distrib }}
           package_extension: ${{ matrix.package_extension }}
           arch: ${{ matrix.arch }}
-          release: 4
+          release: 5
           commit_hash: ${{ github.sha }}
           cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}
           rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }}