Release 20241015 (#5241)

centreon · Oct 15, 2024 · 5bcf294 · 5bcf294
2 parents 5c1ef68 + b4607ba
commit 5bcf294
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml
@@ -95,7 +95,7 @@ runs:
           jf rt download $ARTIFACT --flat
         done
 
-        for ARTIFACT_DL in $(dir -1|grep -E ".+${{ inputs.distrib }}.+\.deb"); do
+        for ARTIFACT_DL in $(dir -1|grep -E ".+${{ steps.parse-distrib.outputs.package_distrib_name }}.+\.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"

diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml
@@ -73,6 +73,13 @@ jobs:
           rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }}
           rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }}
           stability: ${{ needs.get-environment.outputs.stability }}
+      - name: Upload apt/dnf packages as artifacts if asked
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'upload-artifacts') }}
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        with:
+          name: vmware-connector-daemon-${{ matrix.distrib }}
+          path: centreon-plugin*
+          retention-days: 1
 
   deliver-rpm:
     needs: [get-environment, package]

diff --git a/connectors/vmware/changelog b/connectors/vmware/changelog
@@ -1,3 +1,6 @@
+2024-10-10 Olivier Mercier <[email protected]> - 3.3.1
+ * Fix: add missing centreonvault.pm file to packaging
+
 2024-10-10 Olivier Mercier <[email protected]> - 3.3.0
  * Enhancement: add ability to read configuration from JSON file
  * Enhancement: add ability to get the VMware credentials from a Centreon

diff --git a/connectors/vmware/packaging/centreon-plugin-virtualization-vmware-daemon.yaml b/connectors/vmware/packaging/centreon-plugin-virtualization-vmware-daemon.yaml
@@ -39,6 +39,13 @@ contents:
     dst: "/usr/share/perl5/centreon/script/centreon_vmware.pm"
     packager: deb
 
+  - src: "../src/centreon/script/centreonvault.pm"
+    dst: "/usr/share/perl5/vendor_perl/centreon/script/centreonvault.pm"
+    packager: rpm
+  - src: "../src/centreon/script/centreonvault.pm"
+    dst: "/usr/share/perl5/centreon/script/centreonvault.pm"
+    packager: deb
+
   - src: "../src/centreon/script/centreon_vmware_convert_config_file"
     dst: "/usr/bin/centreon_vmware_convert_config_file"
     file_info:

diff --git a/connectors/vmware/src/centreon/script/centreon_vmware.pm b/connectors/vmware/src/centreon/script/centreon_vmware.pm
@@ -54,7 +54,7 @@ BEGIN {
 
 use base qw(centreon::vmware::script);
 
-my $VERSION = '3.3.0';
+my $VERSION = '3.3.1';
 my %handlers = (TERM => {}, HUP => {}, CHLD => {});
 
 my @load_modules = (