From cc29de2186dfffb9f32fae9149805eaf49a9bd22 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 16:30:06 +0100 Subject: [PATCH] Revert "triggering packaging and delivery for deb12 only" This reverts commit b6a1d789ccbc1a22723005c8ce26d217808bbf30. --- .github/actions/package-nfpm/action.yml | 1 + .github/workflows/connector-vmware.yml | 42 +++++----- .github/workflows/nrpe.yml | 38 ++++----- .github/workflows/perl-cpan-libraries.yml | 38 ++++----- .github/workflows/perl-crypt-argon2.yml | 46 +++++------ .github/workflows/perl-filesys-smbclient.yml | 38 ++++----- .github/workflows/perl-json-path.yml | 40 +++++----- .github/workflows/perl-keepass-reader.yml | 38 ++++----- .github/workflows/perl-libssh-session.yml | 46 +++++------ .github/workflows/perl-net-curl.yml | 46 +++++------ .github/workflows/perl-openwsman.yml | 62 +++++++-------- .github/workflows/perl-vmware-vsphere.yml | 42 +++++----- .github/workflows/plink.yml | 36 ++++----- .github/workflows/plugin-delivery.yml | 82 ++++++++++---------- .github/workflows/plugins-selinux.yml | 36 ++++----- src/centreon/plugins/dbi.pm | 1 - 16 files changed, 316 insertions(+), 316 deletions(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index b882be9f1..50bc05e38 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -76,6 +76,7 @@ runs: MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 ) MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) + BUMP_MAJOR_RIGHT=$(( MAJOR_RIGHT_PART + 1 )) if [ "$MAJOR_RIGHT" = "04" ]; then BUMP_MAJOR_LEFT="$MAJOR_LEFT" BUMP_MAJOR_RIGHT="10" diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 8d4f2900a..086e40501 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -71,29 +71,29 @@ jobs: rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} stability: ${{ needs.get-environment.outputs.stability }} - # deliver-rpm: - # needs: - # - get-environment - # - package - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: + - get-environment + - package + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: connector-vmware - # distrib: ${{ matrix.distrib }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: connector-vmware + distrib: ${{ matrix.distrib }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} deliver-deb: needs: @@ -104,7 +104,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index a3b70024f..80c1090b4 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -111,27 +111,27 @@ jobs: rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} stability: ${{ needs.get-environment.outputs.stability }} - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: nrpe - # distrib: ${{ matrix.distrib }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: nrpe + distrib: ${{ matrix.distrib }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} deliver-deb: needs: [get-environment, package] @@ -140,7 +140,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye] steps: - name: Checkout sources diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index b3072e6a2..9b27b0ec5 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -318,27 +318,27 @@ jobs: path: ./*.deb key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - # deliver-rpm: - # needs: [get-environment, sign-rpm] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, sign-rpm] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-cpan-libraries - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-cpan-libraries + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, download-and-cache-deb] @@ -347,7 +347,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 65d5bb2a1..98cdca94a 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -129,29 +129,29 @@ jobs: path: ./*.${{ matrix.package_extension}} retention-days: 1 - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # name: Deliver ${{ matrix.distrib }} + name: Deliver ${{ matrix.distrib }} - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-crypt-argon2-amd64 - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: cache-${{ github.sha }}-rpm-perl-crypt-argon2-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-crypt-argon2-amd64 + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: cache-${{ github.sha }}-rpm-perl-crypt-argon2-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package] @@ -161,12 +161,12 @@ jobs: strategy: matrix: include: - # - distrib: bullseye - # arch: amd64 + - distrib: bullseye + arch: amd64 - distrib: bookworm arch: amd64 - # - distrib: bullseye - # arch: arm64 + - distrib: bullseye + arch: arm64 name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }} diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index 95bbe36ba..6b5edbbae 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -145,27 +145,27 @@ jobs: path: ./*.deb key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - # deliver-rpm: - # needs: [get-environment, sign-rpm] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, sign-rpm] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-filesys-smbclient - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-filesys-smbclient + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package-deb] @@ -174,7 +174,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 62f0185b1..6a9e7034b 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -117,29 +117,29 @@ jobs: path: ./*.${{ matrix.package_extension}} retention-days: 1 - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # name: Deliver ${{ matrix.distrib }} + name: Deliver ${{ matrix.distrib }} - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-json-path - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: cache-${{ github.sha }}-rpm-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-json-path + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: cache-${{ github.sha }}-rpm-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package] @@ -148,7 +148,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] name: Deliver ${{ matrix.distrib }} diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index 8fa93f307..f653ed14c 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -153,27 +153,27 @@ jobs: path: ./*.deb retention-days: 1 - # deliver-rpm: - # needs: [get-environment, sign-rpm] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, sign-rpm] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-keepass-reader - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-keepass-reader + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package-deb] @@ -182,7 +182,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 373453361..9e3b80149 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -127,29 +127,29 @@ jobs: path: ./*.${{ matrix.package_extension}} retention-days: 1 - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # name: Deliver ${{ matrix.distrib }} + name: Deliver ${{ matrix.distrib }} - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-libssh-session-amd64 - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: cache-${{ github.sha }}-rpm-perl-libssh-session-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-libssh-session-amd64 + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: cache-${{ github.sha }}-rpm-perl-libssh-session-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package] @@ -159,10 +159,10 @@ jobs: strategy: matrix: include: - # - distrib: bullseye - # arch: amd64 - # - distrib: bullseye - # arch: arm64 + - distrib: bullseye + arch: amd64 + - distrib: bullseye + arch: arm64 - distrib: bookworm arch: amd64 diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 8ee2f724f..d042506b1 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -127,29 +127,29 @@ jobs: path: ./*.${{ matrix.package_extension}} retention-days: 1 - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # name: Deliver ${{ matrix.distrib }} + name: Deliver ${{ matrix.distrib }} - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-net-curl-amd64 - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: cache-${{ github.sha }}-rpm-perl-net-curl-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-net-curl-amd64 + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: cache-${{ github.sha }}-rpm-perl-net-curl-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package] @@ -159,12 +159,12 @@ jobs: strategy: matrix: include: - # - distrib: bullseye - # arch: amd64 + - distrib: bullseye + arch: amd64 - distrib: bookworm arch: amd64 - # - distrib: bullseye - # arch: arm64 + - distrib: bullseye + arch: arm64 name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }} diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 9aee5e9f3..3c58af5af 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -192,38 +192,38 @@ jobs: path: ./*.${{ matrix.package_extension}} retention-days: 1 - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # name: Deliver ${{ matrix.distrib }} + name: Deliver ${{ matrix.distrib }} - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery libwsman - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: libwsman-amd64 - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: cache-${{ github.sha }}-rpm-libwsman-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery libwsman + uses: ./.github/actions/rpm-delivery + with: + module_name: libwsman-amd64 + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: cache-${{ github.sha }}-rpm-libwsman-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} + stability: ${{ needs.get-environment.outputs.stability }} - # - name: Delivery perl-openwsman - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-openwsman-amd64 - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: cache-${{ github.sha }}-rpm-perl-openwsman-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery perl-openwsman + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-openwsman-amd64 + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: cache-${{ github.sha }}-rpm-perl-openwsman-${{ matrix.distrib }}-amd64-${{ github.head_ref || github.ref_name }} + stability: ${{ needs.get-environment.outputs.stability }} deliver-deb: needs: [get-environment, package] @@ -233,12 +233,12 @@ jobs: strategy: matrix: include: - # - distrib: bullseye - # arch: amd64 + - distrib: bullseye + arch: amd64 - distrib: bookworm arch: amd64 - # - distrib: bullseye - # arch: arm64 + - distrib: bullseye + arch: arm64 name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 4d7647cac..9dd6821d4 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -97,29 +97,29 @@ jobs: rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} stability: ${{ needs.get-environment.outputs.stability }} - # deliver-rpm: - # needs: - # - get-environment - # - package - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: + - get-environment + - package + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: perl-vmware-vsphere - # distrib: ${{ matrix.distrib }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: perl-vmware-vsphere + distrib: ${{ matrix.distrib }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} deliver-deb: needs: @@ -130,7 +130,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/plink.yml b/.github/workflows/plink.yml index e5dd22634..ff5429a78 100644 --- a/.github/workflows/plink.yml +++ b/.github/workflows/plink.yml @@ -108,27 +108,27 @@ jobs: path: ./*.rpm retention-days: 1 - # deliver-rpm: - # needs: [get-environment, sign-rpm] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, sign-rpm] + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: plink - # distrib: ${{ matrix.distrib }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: plink + distrib: ${{ matrix.distrib }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index 828a8c4ba..be4919159 100644 --- a/.github/workflows/plugin-delivery.yml +++ b/.github/workflows/plugin-delivery.yml @@ -67,28 +67,28 @@ jobs: stability: ${{ inputs.stability }} artifactory_token: ${{ secrets.artifactory_token }} - # deliver-rpm-legacy: - # if: ${{ inputs.stability == 'stable' && github.event_name != 'workflow_dispatch' }} - # runs-on: [self-hosted, common] - # strategy: - # fail-fast: false - # matrix: - # distrib: [el7, el8] - # major_version: ["21.10", "22.04", "22.10"] + deliver-rpm-legacy: + if: ${{ inputs.stability == 'stable' && github.event_name != 'workflow_dispatch' }} + runs-on: [self-hosted, common] + strategy: + fail-fast: false + matrix: + distrib: [el7, el8] + major_version: ["21.10", "22.04", "22.10"] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery-legacy - # with: - # module_name: plugins - # major_version: ${{ matrix.major_version }} - # distrib: ${{ matrix.distrib }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ inputs.stability }} - # artifactory_token: ${{ secrets.artifactory_token }} + - name: Delivery + uses: ./.github/actions/rpm-delivery-legacy + with: + module_name: plugins + major_version: ${{ matrix.major_version }} + distrib: ${{ matrix.distrib }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ inputs.stability }} + artifactory_token: ${{ secrets.artifactory_token }} deliver-deb: if: ${{ github.event_name != 'workflow_dispatch' }} @@ -96,7 +96,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources @@ -111,28 +111,28 @@ jobs: stability: ${{ inputs.stability }} artifactory_token: ${{ secrets.artifactory_token }} - # deliver-deb-legacy: - # if: ${{ inputs.stability == 'stable' && github.event_name != 'workflow_dispatch' }} - # runs-on: [self-hosted, common] - # strategy: - # fail-fast: false - # matrix: - # distrib: [bullseye] - # major_version: ["22.04", "22.10"] + deliver-deb-legacy: + if: ${{ inputs.stability == 'stable' && github.event_name != 'workflow_dispatch' }} + runs-on: [self-hosted, common] + strategy: + fail-fast: false + matrix: + distrib: [bullseye] + major_version: ["22.04", "22.10"] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/deb-delivery-legacy - # with: - # module_name: plugins - # distrib: ${{ matrix.distrib }} - # major_version: ${{ matrix.major_version }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - # stability: ${{ inputs.stability }} - # artifactory_token: ${{ secrets.artifactory_token }} + - name: Delivery + uses: ./.github/actions/deb-delivery-legacy + with: + module_name: plugins + distrib: ${{ matrix.distrib }} + major_version: ${{ matrix.major_version }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} + stability: ${{ inputs.stability }} + artifactory_token: ${{ secrets.artifactory_token }} release-tag: if: ${{ inputs.stability == 'stable' && github.event_name == 'push' }} diff --git a/.github/workflows/plugins-selinux.yml b/.github/workflows/plugins-selinux.yml index 7f266570e..fe7e92ea1 100644 --- a/.github/workflows/plugins-selinux.yml +++ b/.github/workflows/plugins-selinux.yml @@ -69,24 +69,24 @@ jobs: rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} stability: ${{ needs.get-environment.outputs.stability }} - # deliver-rpm: - # needs: [get-environment, package] - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} - # runs-on: [self-hosted, common] + deliver-rpm: + needs: [get-environment, package] + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + runs-on: [self-hosted, common] - # strategy: - # matrix: - # distrib: [el8, el9] + strategy: + matrix: + distrib: [el8, el9] - # steps: - # - name: Checkout sources - # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + steps: + - name: Checkout sources + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # - name: Delivery - # uses: ./.github/actions/rpm-delivery - # with: - # module_name: plugins-selinux - # distrib: ${{ matrix.distrib }} - # cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} - # stability: ${{ needs.get-environment.outputs.stability }} - # artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} + - name: Delivery + uses: ./.github/actions/rpm-delivery + with: + module_name: plugins-selinux + distrib: ${{ matrix.distrib }} + cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-${{ matrix.distrib }} + stability: ${{ needs.get-environment.outputs.stability }} + artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/src/centreon/plugins/dbi.pm b/src/centreon/plugins/dbi.pm index 9b9734644..ff61fa1f5 100644 --- a/src/centreon/plugins/dbi.pm +++ b/src/centreon/plugins/dbi.pm @@ -26,7 +26,6 @@ use DBI; use Digest::MD5 qw(md5_hex); use POSIX qw(:signal_h); - my %handlers = ( ALRM => {} ); sub new {