From 2255238bd1f3c1137ba7ba7de9ca20e6485fca3e Mon Sep 17 00:00:00 2001 From: omercier <32134301+omercier@users.noreply.github.com> Date: Mon, 14 Oct 2024 18:11:59 +0200 Subject: [PATCH 1/3] fix(vmware-daemon): add missing centreonvault.pm file to packaging (#5239) Co-authored-by: pkippes --- .github/workflows/connector-vmware.yml | 7 +++++++ connectors/vmware/changelog | 3 +++ .../centreon-plugin-virtualization-vmware-daemon.yaml | 7 +++++++ connectors/vmware/src/centreon/script/centreon_vmware.pm | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 2e25a3858e..8dce7bfbd8 100644 --- 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 index d842412c12..e96a926faf 100644 --- a/connectors/vmware/changelog +++ b/connectors/vmware/changelog @@ -1,3 +1,6 @@ +2024-10-10 Olivier Mercier - 3.3.1 + * Fix: add missing centreonvault.pm file to packaging + 2024-10-10 Olivier Mercier - 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 index bfe7829620..75f9d4bca1 100644 --- 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 index f0a7b5740b..7cf1e9a37b 100644 --- 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 = ( From c47adcdca23cb8052e78a1ec1c724827b418cb6c Mon Sep 17 00:00:00 2001 From: tuntoja Date: Mon, 14 Oct 2024 18:41:00 +0200 Subject: [PATCH 2/3] fix(promote): fix promote behavior to handle new debian package naming --- .github/actions/promote-to-stable/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml index 209f10d38d..6383919698 100644 --- 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" From b4607ba616eecb3d6f0ec24092901d53a4b93450 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:51:47 +0200 Subject: [PATCH 3/3] Update .github/actions/promote-to-stable/action.yml --- .github/actions/promote-to-stable/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml index 6383919698..e0b519d017 100644 --- 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 ".+{{ steps.parse-distrib.outputs.package_distrib_name }}.+\.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"