From e9899a4b228573fb07dd50fdecc03acc7ba733f3 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Fri, 12 Jan 2024 14:11:40 +0100 Subject: [PATCH 01/19] try to deliver deb12 packages --- .github/actions/package/action.yml | 8 +++ .../Dockerfile.packaging-plugins-bookworm | 52 +++++++++++++++++++ .github/workflows/plugins.yml | 4 ++ 3 files changed, 64 insertions(+) create mode 100644 .github/docker/Dockerfile.packaging-plugins-bookworm diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml index f8e5d685f4..fcb3440e62 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -53,6 +53,11 @@ runs: if [ "${{ inputs.package_extension }}" = "rpm" ]; then export DIST=".${{ inputs.distrib }}" else + if [ "${{ inputs.stability }}" = "unstable" ] || [ "${{ inputs.stability }}" = "canary" ]; then + export RELEASE="$RELEASE-${{ inputs.distrib }}" + elif [ "${{ inputs.stability }}" = "testing" ]; then + export RELEASE="${{ inputs.distrib }}" + fi export DIST="" fi @@ -64,6 +69,9 @@ runs: DIRNAME=$(dirname $FILE) BASENAME=$(basename $FILE) cd $DIRNAME + if [ -f $DIRNAME/env/.env.${{ inputs.distrib }} ]; then + source $DIRNAME/env/.env.${{ inputs.distrib }} + fi sed -i "s/@COMMIT_HASH@/${{ inputs.commit_hash }}/g" $BASENAME nfpm package --config $BASENAME --packager ${{ inputs.package_extension }} cd - diff --git a/.github/docker/Dockerfile.packaging-plugins-bookworm b/.github/docker/Dockerfile.packaging-plugins-bookworm new file mode 100644 index 0000000000..8b00394dbc --- /dev/null +++ b/.github/docker/Dockerfile.packaging-plugins-bookworm @@ -0,0 +1,52 @@ +ARG REGISTRY_URL + +FROM ${REGISTRY_URL}/debian:bookworm + +ENV DEBIAN_FRONTEND noninteractive + +# fix locale +RUN bash -e < Date: Fri, 12 Jan 2024 14:33:04 +0100 Subject: [PATCH 02/19] fix package input job --- .github/actions/package/action.yml | 3 +++ .github/workflows/perl-libssh-session.yml | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml index fcb3440e62..44a0112261 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -31,6 +31,9 @@ inputs: rpm_gpg_signing_passphrase: description: The rpm gpg signing passphrase required: true + stability: + description: "The package stability (stable, testing, unstable)" + required: true runs: using: composite diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index b50b857793..320d86ec5b 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -44,6 +44,11 @@ jobs: package_extension: deb runner: ubuntu-22.04 arch: amd64 + - image: packaging-plugins-bookworm + distrib: bookworm + package_extension: deb + runner: ubuntu-22.04 + arch: amd64 - image: packaging-plugins-bullseye-arm64 distrib: bullseye package_extension: deb @@ -158,6 +163,8 @@ jobs: arch: amd64 - distrib: bullseye arch: arm64 + - distrib: bookworm + arch: amd64 name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }} From bc9a9a25ae3be2a6c08aca009d6bd76276e07d0f Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 09:37:03 +0100 Subject: [PATCH 03/19] fix dockerfile --- .github/docker/Dockerfile.packaging-plugins-bookworm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/docker/Dockerfile.packaging-plugins-bookworm b/.github/docker/Dockerfile.packaging-plugins-bookworm index 8b00394dbc..caf7d402a9 100644 --- a/.github/docker/Dockerfile.packaging-plugins-bookworm +++ b/.github/docker/Dockerfile.packaging-plugins-bookworm @@ -21,13 +21,14 @@ RUN bash -e < Date: Mon, 15 Jan 2024 09:41:48 +0100 Subject: [PATCH 04/19] add stability variable on secondary packaging actions --- .github/workflows/connector-vmware.yml | 4 ++++ .github/workflows/nrpe.yml | 1 + .github/workflows/perl-vmware-vsphere.yml | 1 + .github/workflows/plugins-selinux.yml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 0be147a0c9..062a62698d 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -40,6 +40,9 @@ jobs: - package_extension: deb image: packaging-plugins-bullseye distrib: bullseye + - package_extension: deb + image: packaging-plugins-bookworm + distrib: bookworm container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }} @@ -66,6 +69,7 @@ jobs: rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} 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 }} deliver-rpm: needs: diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index b76e986cc3..2dab4b2ab3 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -106,6 +106,7 @@ jobs: rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} 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 }} deliver-rpm: needs: [get-environment, package] diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index b1847e8026..912fae2394 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -91,6 +91,7 @@ jobs: rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} 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 }} deliver-rpm: needs: diff --git a/.github/workflows/plugins-selinux.yml b/.github/workflows/plugins-selinux.yml index 4a771a394c..fcb516a3c2 100644 --- a/.github/workflows/plugins-selinux.yml +++ b/.github/workflows/plugins-selinux.yml @@ -67,7 +67,7 @@ jobs: rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} 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 }} deliver-rpm: needs: [get-environment, package] if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} From f950ecb20cdaf5564bc047a097528ef7a087d3be Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 09:44:53 +0100 Subject: [PATCH 05/19] fix perl-vmware vsphere action dependency --- .github/workflows/perl-vmware-vsphere.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 912fae2394..03841b2712 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -47,6 +47,7 @@ jobs: package: needs: - get-sources + - get-environment runs-on: ubuntu-22.04 strategy: matrix: From 03bd824abe09c1c2a23483cb63e4f374d14984b0 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 09:48:41 +0100 Subject: [PATCH 06/19] add distribution to packaging jobs --- .github/workflows/nrpe.yml | 3 +++ .github/workflows/perl-vmware-vsphere.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 2dab4b2ab3..80c1090b44 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -38,6 +38,9 @@ jobs: - package_extension: deb image: packaging-plugins-bullseye distrib: bullseye + - package_extension: deb + image: packaging-plugins-bookworm + distrib: bookworm container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 03841b2712..d8173a6653 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -61,6 +61,9 @@ jobs: - package_extension: deb image: packaging-plugins-bullseye distrib: bullseye + - package_extension: deb + image: packaging-plugins-bookworm + distrib: bookworm container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }} From 45b33fe720f9d30c4631d25137812d56fafb274e Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 10:30:56 +0100 Subject: [PATCH 07/19] doubled bullseye usage with bookworm --- .github/actions/deb-delivery/action.yml | 2 +- .github/actions/package/action.yml | 2 +- .github/actions/promote-to-stable/action.yml | 2 +- .github/actions/rpm-delivery/action.yml | 4 ++-- .github/workflows/connector-vmware.yml | 2 +- .../docker-builder-packaging-plugins.yml | 3 +++ .github/workflows/get-environment.yml | 2 +- .github/workflows/perl-cpan-libraries.yml | 20 ++++++++++++------- .github/workflows/perl-crypt-argon2.yml | 13 ++++++++++-- .github/workflows/perl-filesys-smbclient.yml | 6 ++++-- .github/workflows/perl-json-path.yml | 12 ++++++----- .github/workflows/perl-keepass-reader.yml | 6 ++++-- .github/workflows/perl-libssh-session.yml | 6 ++++-- .github/workflows/perl-net-curl.yml | 13 ++++++++++-- .github/workflows/perl-openwsman.yml | 20 ++++++++++++++----- .github/workflows/perl-vmware-vsphere.yml | 2 +- .github/workflows/plugin-delivery.yml | 2 +- .github/workflows/plugins-selinux.yml | 1 + 18 files changed, 82 insertions(+), 36 deletions(-) diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml index 5af1b4eeb7..c5862f82c0 100644 --- a/.github/actions/deb-delivery/action.yml +++ b/.github/actions/deb-delivery/action.yml @@ -45,6 +45,6 @@ runs: ARCH=$(echo $FILE | cut -d '_' -f3 | cut -d '.' -f1) - jf rt upload "$FILE" "apt-plugins-${{ inputs.stability }}/pool/${{ inputs.module_name }}/" --deb "${{ inputs.distrib }}/main/$ARCH" + jf rt upload "$FILE" "test-apt-plugins-${{ 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 index 44a0112261..6f6df1ac8e 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -32,7 +32,7 @@ inputs: description: The rpm gpg signing passphrase required: true stability: - description: "The package stability (stable, testing, unstable)" + description: "The package stability (stable, testing, unstable, canary)" required: true runs: diff --git a/.github/actions/promote-to-stable/action.yml b/.github/actions/promote-to-stable/action.yml index 1a26c7a7d6..91f445adbd 100644 --- a/.github/actions/promote-to-stable/action.yml +++ b/.github/actions/promote-to-stable/action.yml @@ -60,7 +60,7 @@ runs: shell: bash - name: Promote DEB package to stable - if: ${{ startsWith(inputs.distrib, 'bullseye') }} + if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' }} run: | echo "[DEBUG] - Distrib: ${{ inputs.distrib }}" diff --git a/.github/actions/rpm-delivery/action.yml b/.github/actions/rpm-delivery/action.yml index 45eabad400..7cc4c8a7f4 100644 --- a/.github/actions/rpm-delivery/action.yml +++ b/.github/actions/rpm-delivery/action.yml @@ -68,9 +68,9 @@ runs: for ARCH in "noarch" "x86_64"; do if [ "$(ls -A $ARCH)" ]; then if [ "${{ inputs.stability }}" == "stable" ]; then - jf rt upload "$ARCH/*.rpm" "rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/RPMS/${{ inputs.module_name }}/" --flat + jf rt upload "$ARCH/*.rpm" "test-rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/RPMS/${{ inputs.module_name }}/" --flat else - jf rt upload "$ARCH/*.rpm" "rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/" --flat + jf rt upload "$ARCH/*.rpm" "test-rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/" --flat fi fi done diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 062a62698d..086e405014 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -104,7 +104,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/docker-builder-packaging-plugins.yml b/.github/workflows/docker-builder-packaging-plugins.yml index dd95281c6a..01677d2534 100644 --- a/.github/workflows/docker-builder-packaging-plugins.yml +++ b/.github/workflows/docker-builder-packaging-plugins.yml @@ -37,6 +37,9 @@ jobs: - runner: ["self-hosted", "collect-arm64"] dockerfile: packaging-plugins-bullseye image: packaging-plugins-bullseye-arm64 + - runner: ubuntu-22.04 + dockerfile: packaging-plugins-bookworm + image: packaging-plugins-bookworm runs-on: ${{ matrix.runner }} diff --git a/.github/workflows/get-environment.yml b/.github/workflows/get-environment.yml index 3ae9be4aec..b918c7bfa0 100644 --- a/.github/workflows/get-environment.yml +++ b/.github/workflows/get-environment.yml @@ -39,7 +39,7 @@ jobs: develop) STABILITY="unstable" ;; - release* | hotfix*) + release* | hotfix* | MON-34064*) STABILITY="testing" ;; master) diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index d2b9bbaff0..9b27b0ec52 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [el8, el9, bullseye] + distrib: [el8, el9, bullseye, bookworm] name: [ "Authen::SASL::SASLprep", @@ -98,7 +98,7 @@ jobs: "ZMQ::LibZMQ4" ] include: - - build_distribs: "el8,el9,bullseye" + - build_distribs: "el8,el9,bullseye,bookworm" - rpm_dependencies: "" - deb_dependencies: "" - rpm_provides: "" @@ -114,6 +114,9 @@ jobs: - distrib: bullseye package_extension: deb image: packaging-plugins-bullseye + - distrib: bookworm + package_extension: deb + image: packaging-plugins-bookworm - name: "BSON" build_distribs: "el8,el9" rpm_provides: "perl(BSON::Bytes) perl(BSON::Code) perl(BSON::DBRef) perl(BSON::OID) perl(BSON::Raw) perl(BSON::Regex) perl(BSON::Time) perl(BSON::Timestamp) perl(BSON::Types) perl(BSON)" @@ -145,7 +148,7 @@ jobs: build_distribs: "el8,el9" version: "0.31" - name: "ZMQ::Constants" - build_distribs: "el9,bullseye" + build_distribs: "el9,bullseye,bookworm" - name: "ZMQ::FFI" build_distribs: "el8,el9" rpm_dependencies: "zeromq" @@ -301,16 +304,19 @@ jobs: download-and-cache-deb: needs: [package] runs-on: ubuntu-22.04 + strategy: + matrix: + distrib: [bullseye, bookworm] steps: - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 with: - name: packages-deb-bullseye + name: packages-deb-${{ matrix.distrib }} path: ./ - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 with: path: ./*.deb - key: ${{ github.sha }}-${{ github.run_id }}-deb-bullseye + key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} deliver-rpm: needs: [get-environment, sign-rpm] @@ -341,7 +347,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources @@ -362,7 +368,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-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 2706c1b74f..98cdca94ab 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -46,6 +46,11 @@ jobs: package_extension: deb runner: ubuntu-22.04 arch: amd64 + - image: packaging-plugins-bookworm + distrib: bookworm + package_extension: deb + runner: ubuntu-22.04 + arch: amd64 - image: packaging-plugins-bullseye-arm64 distrib: bullseye package_extension: deb @@ -68,7 +73,7 @@ jobs: - name: Install locally Crypt::Argon2 run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then apt-get update apt-get install -y cpanminus gcc else @@ -80,7 +85,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then NAME="libcrypt-argon2-perl" if [ "${{ matrix.arch }}" = "amd64" ]; then PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32" @@ -158,6 +163,8 @@ jobs: include: - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 @@ -189,6 +196,8 @@ jobs: arch: amd64 - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index 9d92daf0c5..6b5edbbae2 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -118,6 +118,8 @@ jobs: include: - image: packaging-plugins-bullseye distrib: bullseye + - image: packaging-plugins-bookworm + distrib: bookworm name: package ${{ matrix.distrib }} container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest @@ -172,7 +174,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources @@ -193,7 +195,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 index 251be48502..6a9e7034b8 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -38,6 +38,9 @@ jobs: - image: packaging-plugins-bullseye distrib: bullseye package_extension: deb + - image: packaging-plugins-bookworm + distrib: bookworm + package_extension: deb runs-on: ubuntu-22.04 @@ -55,7 +58,7 @@ jobs: - name: Install locally JSON::Path run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then apt-get update apt-get install -y cpanminus gcc else @@ -72,7 +75,7 @@ jobs: - name: Set package name and paths according to distrib run: | VERSION="1.0.3" - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then NAME="libjson-path-perl" PERL_VENDORLIB="/usr/share/perl5" else @@ -145,8 +148,7 @@ jobs: strategy: matrix: - distrib: [bullseye] - + distrib: [bullseye, bookworm] name: Deliver ${{ matrix.distrib }} @@ -169,7 +171,7 @@ jobs: runs-on: [self-hosted, common] strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index f0fb14c342..f653ed14c8 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -120,6 +120,8 @@ jobs: include: - image: bullseye distrib: bullseye + - image: bookworm + distrib: bookworm name: package ${{ matrix.distrib }} container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/packaging-plugins-${{ matrix.image }}:latest @@ -180,7 +182,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources @@ -201,7 +203,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-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 320d86ec5b..9e3b801490 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -71,7 +71,7 @@ jobs: - name: Install locally Libssh::Session run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then apt-get update apt-get install -y cpanminus gcc libssh-dev else @@ -83,7 +83,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then NAME="libssh-session-perl" if [ "${{ matrix.arch }}" = "amd64" ]; then PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32" @@ -194,6 +194,8 @@ jobs: arch: amd64 - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index ac184b3cd5..d042506b1b 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -44,6 +44,11 @@ jobs: package_extension: deb runner: ubuntu-22.04 arch: amd64 + - image: packaging-plugins-bookworm + distrib: bookworm + package_extension: deb + runner: ubuntu-22.04 + arch: amd64 - image: packaging-plugins-bullseye-arm64 distrib: bullseye package_extension: deb @@ -66,7 +71,7 @@ jobs: - name: Install locally Net::Curl run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then apt-get update apt-get install -y libcurl4-openssl-dev cpanminus gcc else @@ -78,7 +83,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then NAME="libnet-curl-perl" if [ "${{ matrix.arch }}" = "amd64" ]; then PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32" @@ -156,6 +161,8 @@ jobs: include: - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 @@ -187,6 +194,8 @@ jobs: arch: amd64 - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 82ed23b6ef..3c58af5afe 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -45,6 +45,12 @@ jobs: runner: ubuntu-22.04 arch: amd64 version: 2.7.2 + - image: packaging-plugins-bookworm + distrib: bookworm + package_extension: deb + runner: ubuntu-22.04 + arch: amd64 + version: 2.7.2 - image: packaging-plugins-bullseye-arm64 distrib: bullseye package_extension: deb @@ -68,7 +74,7 @@ jobs: - name: Install locally sblim-sfcc run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then apt-get update apt-get install -y libcurl4-openssl-dev cd /tmp @@ -91,7 +97,7 @@ jobs: - name: Build openwsman run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then apt-get install -y cmake libssl-dev libpam-dev swig libxml2-dev else dnf install -y wget cmake gcc-c++ libcurl-devel pam-devel swig libxml2-devel openssl-devel @@ -107,7 +113,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ]; then + if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then NAME_PERL="libopenwsman-perl" USRLIB="/usr/lib/" if [ "${{ matrix.arch }}" = "amd64" ]; then @@ -138,7 +144,7 @@ jobs: shell: bash - name: Package sblim-sfcc - if: ${{ matrix.distrib == 'bullseye' }} + if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' }} uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "dependencies/perl-openwsman/sblim-sfcc.yaml" @@ -229,6 +235,8 @@ jobs: include: - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 @@ -278,6 +286,8 @@ jobs: arch: amd64 - distrib: bullseye arch: amd64 + - distrib: bookworm + arch: amd64 - distrib: bullseye arch: arm64 @@ -286,7 +296,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Promote sblim-sfcc ${{ matrix.distrib }} ${{ matrix.arch }} to stable - if: ${{ matrix.distrib == 'bullseye' }} + if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' }} uses: ./.github/actions/promote-to-stable with: artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index d8173a6653..9dd6821d47 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -130,7 +130,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index e528995fdc..be4919159b 100644 --- a/.github/workflows/plugin-delivery.yml +++ b/.github/workflows/plugin-delivery.yml @@ -96,7 +96,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/plugins-selinux.yml b/.github/workflows/plugins-selinux.yml index fcb516a3c2..fe7e92ea10 100644 --- a/.github/workflows/plugins-selinux.yml +++ b/.github/workflows/plugins-selinux.yml @@ -68,6 +68,7 @@ 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 }} + deliver-rpm: needs: [get-environment, package] if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} From 7011c0bb5188edeaddddff848ad962c961c45d37 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 10:56:01 +0100 Subject: [PATCH 08/19] removed mention of env file as it's not ready yet --- .github/actions/package/action.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml index 6f6df1ac8e..5d669333b8 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -72,9 +72,6 @@ runs: DIRNAME=$(dirname $FILE) BASENAME=$(basename $FILE) cd $DIRNAME - if [ -f $DIRNAME/env/.env.${{ inputs.distrib }} ]; then - source $DIRNAME/env/.env.${{ inputs.distrib }} - fi sed -i "s/@COMMIT_HASH@/${{ inputs.commit_hash }}/g" $BASENAME nfpm package --config $BASENAME --packager ${{ inputs.package_extension }} cd - From b6a1d789ccbc1a22723005c8ce26d217808bbf30 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 14:27:24 +0100 Subject: [PATCH 09/19] triggering packaging and delivery for deb12 only --- .github/actions/package-nfpm/action.yml | 1 - .github/workflows/connector-vmware.yml | 48 +++++------ .github/workflows/nrpe.yml | 44 +++++----- .github/workflows/perl-cpan-libraries.yml | 44 +++++----- .github/workflows/perl-crypt-argon2.yml | 54 ++++++------ .github/workflows/perl-filesys-smbclient.yml | 44 +++++----- .github/workflows/perl-json-path.yml | 48 +++++------ .github/workflows/perl-keepass-reader.yml | 44 +++++----- .github/workflows/perl-libssh-session.yml | 54 ++++++------ .github/workflows/perl-net-curl.yml | 54 ++++++------ .github/workflows/perl-openwsman.yml | 72 ++++++++-------- .github/workflows/perl-vmware-vsphere.yml | 48 +++++------ .github/workflows/plink.yml | 42 ++++----- .github/workflows/plugin-delivery.yml | 90 ++++++++++---------- .github/workflows/plugins-selinux.yml | 36 ++++---- src/centreon/plugins/dbi.pm | 1 + 16 files changed, 362 insertions(+), 362 deletions(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 50bc05e386..b882be9f14 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -76,7 +76,6 @@ 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 086e405014..8d4f2900ab 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: @@ -104,7 +104,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 80c1090b44..a3b70024fe 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, package] @@ -140,7 +140,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 9b27b0ec52..b3072e6a27 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, download-and-cache-deb] @@ -347,7 +347,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 98cdca94ab..65d5bb2a1d 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} 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 6b5edbbae2..95bbe36bad 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, package-deb] @@ -174,7 +174,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 6a9e7034b8..62f0185b1d 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} deliver-deb: needs: [get-environment, package] @@ -148,7 +148,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] name: Deliver ${{ matrix.distrib }} diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index f653ed14c8..8fa93f3078 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, package-deb] @@ -182,7 +182,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 9e3b801490..373453361a 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} 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 d042506b1b..8ee2f724fd 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} 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 3c58af5afe..9aee5e9f37 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 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-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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 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 9dd6821d47..4d7647cac2 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: @@ -130,7 +130,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/plink.yml b/.github/workflows/plink.yml index ff5429a78b..e5dd226349 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} promote: needs: [get-environment] diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index be4919159b..828a8c4ba7 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"] - - 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 }} + # 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 + + # - 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: [bullseye, bookworm] + distrib: [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"] - - 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 }} + # 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 + + # - 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 fe7e92ea10..7f266570ef 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 ff61fa1f5c..9b97346446 100644 --- a/src/centreon/plugins/dbi.pm +++ b/src/centreon/plugins/dbi.pm @@ -26,6 +26,7 @@ use DBI; use Digest::MD5 qw(md5_hex); use POSIX qw(:signal_h); + my %handlers = ( ALRM => {} ); sub new { From 0da7dbcfb823d8025a519fe88f0cd0b71cd630f4 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 16:03:15 +0100 Subject: [PATCH 10/19] forgot to deactivate plugins job delivery --- .github/workflows/plugins.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index eea0c4a9fa..109b1ad002 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -117,18 +117,18 @@ jobs: fail-fast: false matrix: include: - - package_extension: rpm - image: packaging-plugins-centos7 - distrib: el7 - - package_extension: rpm - image: packaging-plugins-alma8 - distrib: el8 - - package_extension: rpm - image: packaging-plugins-alma9 - distrib: el9 - - package_extension: deb - image: packaging-plugins-bullseye - distrib: bullseye + # - package_extension: rpm + # image: packaging-plugins-centos7 + # distrib: el7 + # - package_extension: rpm + # image: packaging-plugins-alma8 + # distrib: el8 + # - package_extension: rpm + # image: packaging-plugins-alma9 + # distrib: el9 + # - package_extension: deb + # image: packaging-plugins-bullseye + # distrib: bullseye - package_extension: deb image: packaging-plugins-bookworm distrib: bookworm From e052917a550579505da5a0c3b54b7df97b6a0968 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 16:29:45 +0100 Subject: [PATCH 11/19] Revert "forgot to deactivate plugins job delivery" This reverts commit 0da7dbcfb823d8025a519fe88f0cd0b71cd630f4. --- .github/workflows/plugins.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 109b1ad002..eea0c4a9fa 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -117,18 +117,18 @@ jobs: fail-fast: false matrix: include: - # - package_extension: rpm - # image: packaging-plugins-centos7 - # distrib: el7 - # - package_extension: rpm - # image: packaging-plugins-alma8 - # distrib: el8 - # - package_extension: rpm - # image: packaging-plugins-alma9 - # distrib: el9 - # - package_extension: deb - # image: packaging-plugins-bullseye - # distrib: bullseye + - package_extension: rpm + image: packaging-plugins-centos7 + distrib: el7 + - package_extension: rpm + image: packaging-plugins-alma8 + distrib: el8 + - package_extension: rpm + image: packaging-plugins-alma9 + distrib: el9 + - package_extension: deb + image: packaging-plugins-bullseye + distrib: bullseye - package_extension: deb image: packaging-plugins-bookworm distrib: bookworm From cc29de2186dfffb9f32fae9149805eaf49a9bd22 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 16:30:06 +0100 Subject: [PATCH 12/19] Revert "triggering packaging and delivery for deb12 only" This reverts commit b6a1d789ccbc1a22723005c8ce26d217808bbf30. --- .github/actions/package-nfpm/action.yml | 1 + .github/workflows/connector-vmware.yml | 48 +++++------ .github/workflows/nrpe.yml | 44 +++++----- .github/workflows/perl-cpan-libraries.yml | 44 +++++----- .github/workflows/perl-crypt-argon2.yml | 54 ++++++------ .github/workflows/perl-filesys-smbclient.yml | 44 +++++----- .github/workflows/perl-json-path.yml | 48 +++++------ .github/workflows/perl-keepass-reader.yml | 44 +++++----- .github/workflows/perl-libssh-session.yml | 54 ++++++------ .github/workflows/perl-net-curl.yml | 54 ++++++------ .github/workflows/perl-openwsman.yml | 72 ++++++++-------- .github/workflows/perl-vmware-vsphere.yml | 48 +++++------ .github/workflows/plink.yml | 42 ++++----- .github/workflows/plugin-delivery.yml | 90 ++++++++++---------- .github/workflows/plugins-selinux.yml | 36 ++++---- src/centreon/plugins/dbi.pm | 1 - 16 files changed, 362 insertions(+), 362 deletions(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index b882be9f14..50bc05e386 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 8d4f2900ab..086e405014 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 a3b70024fe..80c1090b44 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 b3072e6a27..9b27b0ec52 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 65d5bb2a1d..98cdca94ab 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} 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 95bbe36bad..6b5edbbae2 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 62f0185b1d..6a9e7034b8 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} 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 8fa93f3078..f653ed14c8 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 373453361a..9e3b801490 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} 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 8ee2f724fd..d042506b1b 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} 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 9aee5e9f37..3c58af5afe 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 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-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] + + name: Deliver ${{ matrix.distrib }} + + 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 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 4d7647cac2..9dd6821d47 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 e5dd226349..ff5429a78b 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} promote: needs: [get-environment] diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index 828a8c4ba7..be4919159b 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"] - - # 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 }} + 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 + + - 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"] - - # 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 }} + 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 + + - 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 7f266570ef..fe7e92ea10 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 9b97346446..ff61fa1f5c 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 { From 16bd325db0ad25eb175e5f367ad8f9a0d521042c Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 15 Jan 2024 16:30:57 +0100 Subject: [PATCH 13/19] remove branch name in value that triggers testing pkg --- .github/workflows/get-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/get-environment.yml b/.github/workflows/get-environment.yml index b918c7bfa0..3ae9be4aec 100644 --- a/.github/workflows/get-environment.yml +++ b/.github/workflows/get-environment.yml @@ -39,7 +39,7 @@ jobs: develop) STABILITY="unstable" ;; - release* | hotfix* | MON-34064*) + release* | hotfix*) STABILITY="testing" ;; master) From a31f0b17228a62c9ccf832f55687c46663c4637b Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 16 Jan 2024 10:10:29 +0100 Subject: [PATCH 14/19] back to commenting most deliveries to get perl dependencies delivered in deb12 :) --- .github/workflows/connector-vmware.yml | 48 ++++++------- .github/workflows/get-environment.yml | 2 +- .github/workflows/nrpe.yml | 44 ++++++------ .github/workflows/perl-cpan-libraries.yml | 44 ++++++------ .github/workflows/perl-crypt-argon2.yml | 54 +++++++-------- .github/workflows/perl-filesys-smbclient.yml | 44 ++++++------ .github/workflows/perl-json-path.yml | 48 ++++++------- .github/workflows/perl-keepass-reader.yml | 44 ++++++------ .github/workflows/perl-libssh-session.yml | 54 +++++++-------- .github/workflows/perl-net-curl.yml | 54 +++++++-------- .github/workflows/perl-openwsman.yml | 72 ++++++++++---------- .github/workflows/perl-vmware-vsphere.yml | 48 ++++++------- 12 files changed, 278 insertions(+), 278 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 086e405014..8d4f2900ab 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: @@ -104,7 +104,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/get-environment.yml b/.github/workflows/get-environment.yml index 3ae9be4aec..b918c7bfa0 100644 --- a/.github/workflows/get-environment.yml +++ b/.github/workflows/get-environment.yml @@ -39,7 +39,7 @@ jobs: develop) STABILITY="unstable" ;; - release* | hotfix*) + release* | hotfix* | MON-34064*) STABILITY="testing" ;; master) diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 80c1090b44..a3b70024fe 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, package] @@ -140,7 +140,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 9b27b0ec52..b3072e6a27 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, download-and-cache-deb] @@ -347,7 +347,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 98cdca94ab..b513c4b460 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} deliver-deb: needs: [get-environment, package] @@ -161,12 +161,12 @@ jobs: strategy: matrix: include: - - distrib: bullseye - arch: amd64 + # - distrib: bullseye + # arch: amd64 + # - distrib: bullseye + # arch: arm64 - distrib: bookworm arch: amd64 - - 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 6b5edbbae2..95bbe36bad 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, package-deb] @@ -174,7 +174,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 6a9e7034b8..62f0185b1d 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} deliver-deb: needs: [get-environment, package] @@ -148,7 +148,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] name: Deliver ${{ matrix.distrib }} diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index f653ed14c8..8fa93f3078 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: [get-environment, package-deb] @@ -182,7 +182,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 9e3b801490..373453361a 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} 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 d042506b1b..a4259c3a9a 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 }} + # 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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 }} deliver-deb: needs: [get-environment, package] @@ -159,12 +159,12 @@ jobs: strategy: matrix: include: - - distrib: bullseye - arch: amd64 + # - distrib: bullseye + # arch: amd64 + # - distrib: bullseye + # arch: arm64 - distrib: bookworm arch: amd64 - - 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 3c58af5afe..631280ebfd 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] - - strategy: - matrix: - distrib: [el8, el9] - - name: Deliver ${{ matrix.distrib }} - - 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 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-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] + + # name: Deliver ${{ matrix.distrib }} + + # 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 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: bullseye + # arch: arm64 - distrib: bookworm arch: amd64 - - 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 9dd6821d47..4d7647cac2 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] - - strategy: - matrix: - distrib: [el8, el9] - - 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 }} + # 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] + + # 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 }} deliver-deb: needs: @@ -130,7 +130,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bookworm] steps: - name: Checkout sources From 43f5a6b90972f2d219f60f0de34d453e88b4c8cd Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Wed, 17 Jan 2024 17:01:23 +0100 Subject: [PATCH 15/19] Revert "back to commenting most deliveries to get perl dependencies delivered in deb12 :)" This reverts commit a31f0b17228a62c9ccf832f55687c46663c4637b. --- .github/workflows/connector-vmware.yml | 48 ++++++------- .github/workflows/get-environment.yml | 2 +- .github/workflows/nrpe.yml | 44 ++++++------ .github/workflows/perl-cpan-libraries.yml | 44 ++++++------ .github/workflows/perl-crypt-argon2.yml | 54 +++++++-------- .github/workflows/perl-filesys-smbclient.yml | 44 ++++++------ .github/workflows/perl-json-path.yml | 48 ++++++------- .github/workflows/perl-keepass-reader.yml | 44 ++++++------ .github/workflows/perl-libssh-session.yml | 54 +++++++-------- .github/workflows/perl-net-curl.yml | 54 +++++++-------- .github/workflows/perl-openwsman.yml | 72 ++++++++++---------- .github/workflows/perl-vmware-vsphere.yml | 48 ++++++------- 12 files changed, 278 insertions(+), 278 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 8d4f2900ab..086e405014 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} deliver-deb: needs: @@ -104,7 +104,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/get-environment.yml b/.github/workflows/get-environment.yml index b918c7bfa0..3ae9be4aec 100644 --- a/.github/workflows/get-environment.yml +++ b/.github/workflows/get-environment.yml @@ -39,7 +39,7 @@ jobs: develop) STABILITY="unstable" ;; - release* | hotfix* | MON-34064*) + release* | hotfix*) STABILITY="testing" ;; master) diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index a3b70024fe..80c1090b44 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 b3072e6a27..9b27b0ec52 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 b513c4b460..98cdca94ab 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} deliver-deb: needs: [get-environment, package] @@ -161,12 +161,12 @@ jobs: strategy: matrix: include: - # - distrib: bullseye - # arch: amd64 - # - distrib: bullseye - # arch: arm64 + - distrib: bullseye + arch: amd64 - distrib: bookworm arch: amd64 + - 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 95bbe36bad..6b5edbbae2 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 62f0185b1d..6a9e7034b8 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} 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 8fa93f3078..f653ed14c8 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} 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 373453361a..9e3b801490 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} 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 a4259c3a9a..d042506b1b 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 }} + 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] + + name: Deliver ${{ matrix.distrib }} + + 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 }} deliver-deb: needs: [get-environment, package] @@ -159,12 +159,12 @@ jobs: strategy: matrix: include: - # - distrib: bullseye - # arch: amd64 - # - distrib: bullseye - # arch: arm64 + - distrib: bullseye + arch: amd64 - distrib: bookworm arch: amd64 + - 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 631280ebfd..3c58af5afe 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # name: Deliver ${{ matrix.distrib }} - - # 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 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-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] + + name: Deliver ${{ matrix.distrib }} + + 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 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: arm64 + - distrib: bullseye + arch: amd64 - distrib: bookworm arch: amd64 + - 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 4d7647cac2..9dd6821d47 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] - - # strategy: - # matrix: - # distrib: [el8, el9] - - # 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 }} + 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] + + 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 }} deliver-deb: needs: @@ -130,7 +130,7 @@ jobs: strategy: matrix: - distrib: [bookworm] + distrib: [bullseye, bookworm] steps: - name: Checkout sources From 6196bf54be88cb4cabcfe6a0f3156ac817b6c2be Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Thu, 18 Jan 2024 17:38:29 +0100 Subject: [PATCH 16/19] updated zmq4 to zmq5 --- .github/workflows/perl-cpan-libraries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 9b27b0ec52..5ee4b96b91 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -152,7 +152,7 @@ jobs: - name: "ZMQ::FFI" build_distribs: "el8,el9" rpm_dependencies: "zeromq" - - name: "ZMQ::LibZMQ4" + - name: "ZMQ::LibZMQ5" use_dh_make_perl: "false" version: "0.01" rpm_dependencies: "zeromq" From 05f57d23e2b6fa5d5856975e94d3e212dd977854 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Wed, 24 Jan 2024 10:27:30 +0100 Subject: [PATCH 17/19] updated lib for vmware-connector-plugin with correct path --- .../deb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/centreon-plugin-Virtualization-Vmware2-Connector-Plugin/deb.json b/packaging/centreon-plugin-Virtualization-Vmware2-Connector-Plugin/deb.json index 624779bd6d..735060990b 100644 --- a/packaging/centreon-plugin-Virtualization-Vmware2-Connector-Plugin/deb.json +++ b/packaging/centreon-plugin-Virtualization-Vmware2-Connector-Plugin/deb.json @@ -1,7 +1,7 @@ { "dependencies": [ "libjson-perl", - "zmq-libzmq4-perl", + "libzmq-libzmq4-perl", "libuuid-perl" ] } \ No newline at end of file From 4fc802380125b398fc0dc0fbb52b3a14e52f9157 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Wed, 24 Jan 2024 10:37:57 +0100 Subject: [PATCH 18/19] fix --- .github/workflows/perl-cpan-libraries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 5ee4b96b91..9b27b0ec52 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -152,7 +152,7 @@ jobs: - name: "ZMQ::FFI" build_distribs: "el8,el9" rpm_dependencies: "zeromq" - - name: "ZMQ::LibZMQ5" + - name: "ZMQ::LibZMQ4" use_dh_make_perl: "false" version: "0.01" rpm_dependencies: "zeromq" From 3a27c7f75a1ecc2a74a17cedcfadaff13924d2b7 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Wed, 24 Jan 2024 11:57:27 +0100 Subject: [PATCH 19/19] cleanup --- .github/actions/deb-delivery/action.yml | 2 +- .github/actions/rpm-delivery/action.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml index c5862f82c0..5af1b4eeb7 100644 --- a/.github/actions/deb-delivery/action.yml +++ b/.github/actions/deb-delivery/action.yml @@ -45,6 +45,6 @@ runs: ARCH=$(echo $FILE | cut -d '_' -f3 | cut -d '.' -f1) - jf rt upload "$FILE" "test-apt-plugins-${{ inputs.stability }}/pool/${{ inputs.module_name }}/" --deb "${{ inputs.distrib }}/main/$ARCH" + jf rt upload "$FILE" "apt-plugins-${{ inputs.stability }}/pool/${{ inputs.module_name }}/" --deb "${{ inputs.distrib }}/main/$ARCH" done shell: bash diff --git a/.github/actions/rpm-delivery/action.yml b/.github/actions/rpm-delivery/action.yml index 7cc4c8a7f4..45eabad400 100644 --- a/.github/actions/rpm-delivery/action.yml +++ b/.github/actions/rpm-delivery/action.yml @@ -68,9 +68,9 @@ runs: for ARCH in "noarch" "x86_64"; do if [ "$(ls -A $ARCH)" ]; then if [ "${{ inputs.stability }}" == "stable" ]; then - jf rt upload "$ARCH/*.rpm" "test-rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/RPMS/${{ inputs.module_name }}/" --flat + jf rt upload "$ARCH/*.rpm" "rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/RPMS/${{ inputs.module_name }}/" --flat else - jf rt upload "$ARCH/*.rpm" "test-rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/" --flat + jf rt upload "$ARCH/*.rpm" "rpm-plugins/${{ inputs.distrib }}/${{ inputs.stability }}/$ARCH/${{ inputs.module_name }}/" --flat fi fi done