From 12ee977b95c8c4f32ef2cd5b98933a6250f202d8 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 29 Jan 2024 16:02:37 +0100 Subject: [PATCH 01/26] updated naming scheme for centreon plugins perl dependencies --- .github/actions/package-nfpm/action.yml | 8 ++++++++ .github/workflows/perl-crypt-argon2.yml | 1 + .github/workflows/perl-json-path.yml | 1 + .github/workflows/perl-libssh-session.yml | 1 + .github/workflows/perl-net-curl.yml | 1 + .github/workflows/perl-openwsman.yml | 3 +++ 6 files changed, 15 insertions(+) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 50bc05e38..9afba93bb 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -37,6 +37,9 @@ inputs: rpm_gpg_signing_passphrase: description: The rpm gpg signing passphrase required: true + stability: + description: "Branch stability (stable, testing, unstable, canary)" + required: true runs: using: composite @@ -70,6 +73,11 @@ runs: export APACHE_GROUP="apache" else export DIST="" + if [ "${{ inputs.stability }}" = "unstable" ] || [ "${{ inputs.stability }}" = "canary" ]; then + export RELEASE="$RELEASE~${{ inputs.distrib }}" + elif [ "${{ inputs.stability }}" = "testing" ]; then + export RELEASE="1~${{ inputs.distrib }}" + fi export APACHE_USER="www-data" export APACHE_GROUP="www-data" fi diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 98cdca94a..498d56f60 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -119,6 +119,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 }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 6a9e7034b..3398b0ee3 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -107,6 +107,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 }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 9e3b80149..5b7cea551 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -117,6 +117,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 }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index d042506b1..0afd4202a 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -117,6 +117,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 }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 3c58af5af..739d55df2 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -156,6 +156,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 }} - name: Package libwsman uses: ./.github/actions/package-nfpm @@ -169,6 +170,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 }} - name: Package perl-openwsman uses: ./.github/actions/package-nfpm @@ -182,6 +184,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 }} # set condition to true if artifacts are needed - if: ${{ false }} From 8451fdce12c6d7a49fc1359b7860de95bac53f10 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Mon, 29 Jan 2024 18:11:07 +0100 Subject: [PATCH 02/26] general cleanup, merge of package&package-nfpm --- .github/actions/package-nfpm/action.yml | 35 ++++++--- .github/actions/package/action.yml | 93 ----------------------- .github/workflows/connector-vmware.yml | 2 +- .github/workflows/nrpe.yml | 2 +- .github/workflows/perl-crypt-argon2.yml | 2 +- .github/workflows/perl-json-path.yml | 2 +- .github/workflows/perl-libssh-session.yml | 2 +- .github/workflows/perl-net-curl.yml | 2 +- .github/workflows/perl-openwsman.yml | 6 +- .github/workflows/perl-vmware-vsphere.yml | 2 +- .github/workflows/plugins-selinux.yml | 2 +- .github/workflows/plugins.yml | 2 +- 12 files changed, 35 insertions(+), 117 deletions(-) delete mode 100644 .github/actions/package/action.yml diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 9afba93bb..47b4a88f2 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -10,6 +10,9 @@ inputs: distrib: description: The package distrib required: true + version: + description: The package version ([major_version].[minor_version]) + required: false major_version: description: The major version required: false @@ -62,8 +65,15 @@ runs: RPM_GPG_SIGNING_KEY_ID: ${{ inputs.rpm_gpg_signing_key_id }} RPM_GPG_SIGNING_PASSPHRASE: ${{ inputs.rpm_gpg_signing_passphrase }} run: | - export MAJOR_VERSION="${{ inputs.major_version }}" - export VERSION="${{ inputs.major_version }}.${{ inputs.minor_version }}" + if [ -z ${{ inputs.version }} ]; then + export VERSION="${{ inputs.major_version }}.${{ inputs.minor_version }}" + export MAJOR_VERSION="${{ inputs.major_version }}" + export MINOR_VERSION="${{ inputs.minor_version }}" + elif [ -z ${{ inputs.major_version }} ]; + export VERSION="${{ inputs.version }}" + export MAJOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f1 ) + export MINOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f2 ) + fi export RELEASE="${{ inputs.release }}" export ARCH="${{ inputs.arch }}" @@ -82,18 +92,19 @@ runs: export APACHE_GROUP="www-data" fi - 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" - else - BUMP_MAJOR_LEFT=$(( $MAJOR_LEFT + 1 )) - BUMP_MAJOR_RIGHT="04" + if [[ "$MAJOR_VERSION" != "" ]]; then + MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 ) + MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) + if [ "$MAJOR_RIGHT" = "04" ]; then + BUMP_MAJOR_LEFT="$MAJOR_LEFT" + BUMP_MAJOR_RIGHT="10" + else + BUMP_MAJOR_LEFT=$(( $MAJOR_LEFT + 1 )) + BUMP_MAJOR_RIGHT="04" + fi + export NEXT_MAJOR_VERSION="$BUMP_MAJOR_LEFT.$BUMP_MAJOR_RIGHT" fi - export NEXT_MAJOR_VERSION="$BUMP_MAJOR_LEFT.$BUMP_MAJOR_RIGHT" export RPM_SIGNING_KEY_FILE="$(pwd)/key.gpg" export RPM_SIGNING_KEY_ID="$RPM_GPG_SIGNING_KEY_ID" diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml deleted file mode 100644 index 5d669333b..000000000 --- a/.github/actions/package/action.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: package -description: Package module using nfpm -inputs: - nfpm_file_pattern: - description: The pattern of the nfpm configuration file(s) - required: true - package_extension: - description: The package extension (deb or rpm) - required: true - distrib: - description: The package distrib - required: true - version: - description: The package version - required: false - release: - description: The package release number - required: false - commit_hash: - description: The commit hash - required: true - cache_key: - description: The package files cache key - required: true - rpm_gpg_key: - description: The rpm gpg key - required: true - rpm_gpg_signing_key_id: - description: The rpm gpg signing key identifier - required: true - rpm_gpg_signing_passphrase: - description: The rpm gpg signing passphrase - required: true - stability: - description: "The package stability (stable, testing, unstable, canary)" - required: true - -runs: - using: composite - - steps: - - name: Import gpg key - env: - RPM_GPG_SIGNING_KEY: ${{ inputs.rpm_gpg_key }} - run: echo -n "$RPM_GPG_SIGNING_KEY" > key.gpg - shell: bash - - - name: Build ${{ inputs.package_extension }} files - env: - RPM_GPG_SIGNING_KEY_ID: ${{ inputs.rpm_gpg_signing_key_id }} - RPM_GPG_SIGNING_PASSPHRASE: ${{ inputs.rpm_gpg_signing_passphrase }} - run: | - export VERSION="${{ inputs.version }}" - export RELEASE="${{ inputs.release }}" - - 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 - - export RPM_SIGNING_KEY_FILE="$(pwd)/key.gpg" - export RPM_SIGNING_KEY_ID="$RPM_GPG_SIGNING_KEY_ID" - export NFPM_RPM_PASSPHRASE="$RPM_GPG_SIGNING_PASSPHRASE" - - for FILE in ${{ inputs.nfpm_file_pattern }}; do - DIRNAME=$(dirname $FILE) - BASENAME=$(basename $FILE) - cd $DIRNAME - sed -i "s/@COMMIT_HASH@/${{ inputs.commit_hash }}/g" $BASENAME - nfpm package --config $BASENAME --packager ${{ inputs.package_extension }} - cd - - mv $DIRNAME/*.${{ inputs.package_extension }} ./ - done - shell: bash - - - name: Upload package artifacts - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 - with: - name: packages-${{ inputs.distrib }} - path: ./*.${{ inputs.package_extension }} - retention-days: 1 - - - name: Cache packages - uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 - with: - path: ./*.${{ inputs.package_extension }} - key: ${{ inputs.cache_key }} diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 086e40501..bfe97edcb 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "connectors/vmware/packaging/centreon-plugin-virtualization-vmware-daemon.yaml" distrib: ${{ matrix.distrib }} diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 80c1090b4..eb00bfa75 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -97,7 +97,7 @@ jobs: shell: bash - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "nrpe/packaging/*.yaml" distrib: ${{ matrix.distrib }} diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 498d56f60..739b1f6d8 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -115,7 +115,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 3398b0ee3..0dd0968ea 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -103,7 +103,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: all commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} 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 }} diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 5b7cea551..a7d85a3b0 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -113,7 +113,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 0afd4202a..148c17523 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -113,7 +113,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} 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 }} diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 739d55df2..2723a59bd 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -152,7 +152,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} 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 }} @@ -166,7 +166,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} 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 }} @@ -180,7 +180,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} 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 }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 9dd6821d4..4b360b3a2 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -85,7 +85,7 @@ jobs: fail-on-cache-miss: true - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "dependencies/perl-vmware-vsphere/packaging/perl-vmware-vsphere.yaml" distrib: ${{ matrix.distrib }} diff --git a/.github/workflows/plugins-selinux.yml b/.github/workflows/plugins-selinux.yml index fe7e92ea1..0236b5aa0 100644 --- a/.github/workflows/plugins-selinux.yml +++ b/.github/workflows/plugins-selinux.yml @@ -55,7 +55,7 @@ jobs: shell: bash - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "selinux/packaging/centreon-plugins-selinux.yaml" distrib: ${{ matrix.distrib }} diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 078dd312d..1a73f48fb 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -217,7 +217,7 @@ jobs: done shell: bash - - uses: ./.github/actions/package + - uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: ".github/packaging/*.yaml" distrib: ${{ matrix.distrib }} From f99244ed56366f3368192aacc0d3bbbc7d273989 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 09:57:33 +0100 Subject: [PATCH 03/26] removed redundant space --- .github/actions/package-nfpm/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 47b4a88f2..bc9b6af37 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -105,7 +105,6 @@ runs: export NEXT_MAJOR_VERSION="$BUMP_MAJOR_LEFT.$BUMP_MAJOR_RIGHT" fi - export RPM_SIGNING_KEY_FILE="$(pwd)/key.gpg" export RPM_SIGNING_KEY_ID="$RPM_GPG_SIGNING_KEY_ID" export NFPM_RPM_PASSPHRASE="$RPM_GPG_SIGNING_PASSPHRASE" From ba6120a631c56394a572d02ddab1eeebbbb3c586 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 10:02:41 +0100 Subject: [PATCH 04/26] fix then --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index bc9b6af37..b92868702 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -69,7 +69,7 @@ runs: export VERSION="${{ inputs.major_version }}.${{ inputs.minor_version }}" export MAJOR_VERSION="${{ inputs.major_version }}" export MINOR_VERSION="${{ inputs.minor_version }}" - elif [ -z ${{ inputs.major_version }} ]; + elif [ -z ${{ inputs.major_version }} ]; then export VERSION="${{ inputs.version }}" export MAJOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f1 ) export MINOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f2 ) From 0c7028b448d097e513eed4caabb643d412a0dce4 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 10:15:36 +0100 Subject: [PATCH 05/26] [to revert] forced unstable stability on delivery --- .github/workflows/connector-vmware.yml | 2 +- .github/workflows/nrpe.yml | 2 +- .github/workflows/perl-cpan-libraries.yml | 2 +- .github/workflows/perl-crypt-argon2.yml | 2 +- .github/workflows/perl-filesys-smbclient.yml | 2 +- .github/workflows/perl-json-path.yml | 2 +- .github/workflows/perl-keepass-reader.yml | 2 +- .github/workflows/perl-libssh-session.yml | 2 +- .github/workflows/perl-net-curl.yml | 2 +- .github/workflows/perl-openwsman.yml | 6 +++--- .github/workflows/perl-vmware-vsphere.yml | 2 +- .github/workflows/plugin-delivery.yml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index bfe97edcb..b0bf33826 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -116,5 +116,5 @@ jobs: module_name: connector-vmware distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index eb00bfa75..6b089de1c 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -152,5 +152,5 @@ jobs: module_name: nrpe distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 9b27b0ec5..095e21f7a 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -360,7 +360,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 739b1f6d8..4350478a4 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -182,7 +182,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index 6b5edbbae..a47746007 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -187,7 +187,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 0dd0968ea..ca03cb819 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -164,7 +164,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index f653ed14c..7bf2744c3 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -195,7 +195,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index a7d85a3b0..db898235e 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -180,7 +180,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 148c17523..d5aaf9755 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -180,7 +180,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 2723a59bd..914816e8c 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -256,7 +256,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable - name: Delivery libwsman uses: ./.github/actions/deb-delivery @@ -265,7 +265,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable - name: Delivery perl-openwsman uses: ./.github/actions/deb-delivery @@ -274,7 +274,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 4b360b3a2..573258580 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -142,5 +142,5 @@ jobs: module_name: perl-vmware-vsphere distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index be4919159..3264c139a 100644 --- a/.github/workflows/plugin-delivery.yml +++ b/.github/workflows/plugin-delivery.yml @@ -108,7 +108,7 @@ jobs: module_name: plugins distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ inputs.stability }} + stability: unstable artifactory_token: ${{ secrets.artifactory_token }} deliver-deb-legacy: From cfd8cd1ed80ed7c9e3be4952ddc67a9d99b0c464 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 10:25:15 +0100 Subject: [PATCH 06/26] [to revert] forced unstable stability on delivery --- .github/workflows/connector-vmware.yml | 2 +- .github/workflows/nrpe.yml | 2 +- .github/workflows/perl-cpan-libraries.yml | 2 +- .github/workflows/perl-crypt-argon2.yml | 2 +- .github/workflows/perl-filesys-smbclient.yml | 2 +- .github/workflows/perl-json-path.yml | 2 +- .github/workflows/perl-keepass-reader.yml | 2 +- .github/workflows/perl-libssh-session.yml | 2 +- .github/workflows/perl-net-curl.yml | 2 +- .github/workflows/perl-openwsman.yml | 2 +- .github/workflows/perl-vmware-vsphere.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index b0bf33826..27544a042 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -99,7 +99,7 @@ jobs: needs: - get-environment - package - if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 6b089de1c..74592b344 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -135,7 +135,7 @@ jobs: deliver-deb: needs: [get-environment, package] - if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 095e21f7a..d269963d8 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -342,7 +342,7 @@ jobs: deliver-deb: needs: [get-environment, download-and-cache-deb] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 4350478a4..9febd8f58 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -156,7 +156,7 @@ jobs: deliver-deb: needs: [get-environment, package] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index a47746007..eb1159ca4 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -169,7 +169,7 @@ jobs: deliver-deb: needs: [get-environment, package-deb] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index ca03cb819..d53aa0f3f 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -144,7 +144,7 @@ jobs: deliver-deb: needs: [get-environment, package] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index 7bf2744c3..02821848c 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -177,7 +177,7 @@ jobs: deliver-deb: needs: [get-environment, package-deb] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index db898235e..27bffd6e3 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -154,7 +154,7 @@ jobs: deliver-deb: needs: [get-environment, package] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index d5aaf9755..e28e2a2bc 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -154,7 +154,7 @@ jobs: deliver-deb: needs: [get-environment, package] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 914816e8c..47cdf45c2 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -230,7 +230,7 @@ jobs: deliver-deb: needs: [get-environment, package] - if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 573258580..814c08f6d 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -125,7 +125,7 @@ jobs: needs: - get-environment - package - if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: From f647dbf30972f9d78b4c9f79c3b86b7082681c2a Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 10:26:37 +0100 Subject: [PATCH 07/26] fix --- .github/workflows/plugin-delivery.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index 3264c139a..be4919159 100644 --- a/.github/workflows/plugin-delivery.yml +++ b/.github/workflows/plugin-delivery.yml @@ -108,7 +108,7 @@ jobs: module_name: plugins distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ inputs.stability }} artifactory_token: ${{ secrets.artifactory_token }} deliver-deb-legacy: From f6e076e6401b8aed8cb3bd5907768fc9551bba66 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 11:11:07 +0100 Subject: [PATCH 08/26] Revert "[to revert] forced unstable stability on delivery" This reverts commit 0c7028b448d097e513eed4caabb643d412a0dce4. --- .github/workflows/connector-vmware.yml | 2 +- .github/workflows/nrpe.yml | 2 +- .github/workflows/perl-cpan-libraries.yml | 2 +- .github/workflows/perl-crypt-argon2.yml | 2 +- .github/workflows/perl-filesys-smbclient.yml | 2 +- .github/workflows/perl-json-path.yml | 2 +- .github/workflows/perl-keepass-reader.yml | 2 +- .github/workflows/perl-libssh-session.yml | 2 +- .github/workflows/perl-net-curl.yml | 2 +- .github/workflows/perl-openwsman.yml | 6 +++--- .github/workflows/perl-vmware-vsphere.yml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 27544a042..a57a4bfd5 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -116,5 +116,5 @@ jobs: module_name: connector-vmware distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 74592b344..b4b22254a 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -152,5 +152,5 @@ jobs: module_name: nrpe distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index d269963d8..54b8a9c88 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -360,7 +360,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 9febd8f58..ec1fcf7e4 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -182,7 +182,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index eb1159ca4..e15780832 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -187,7 +187,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index d53aa0f3f..354db9296 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -164,7 +164,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index 02821848c..d5e4634f9 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -195,7 +195,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 27bffd6e3..14df078a1 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -180,7 +180,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index e28e2a2bc..05262203f 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -180,7 +180,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 47cdf45c2..98f30f09f 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -256,7 +256,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} - name: Delivery libwsman uses: ./.github/actions/deb-delivery @@ -265,7 +265,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} - name: Delivery perl-openwsman uses: ./.github/actions/deb-delivery @@ -274,7 +274,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 814c08f6d..542db54d3 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -142,5 +142,5 @@ jobs: module_name: perl-vmware-vsphere distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} From 9ad3f4765c66abd36326c13b95a460fd9b62bbcb Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 11:50:31 +0100 Subject: [PATCH 09/26] add release as input for package nfpm jobs --- .github/workflows/nrpe.yml | 2 +- .github/workflows/perl-crypt-argon2.yml | 1 + .github/workflows/perl-json-path.yml | 1 + .github/workflows/perl-libssh-session.yml | 1 + .github/workflows/perl-net-curl.yml | 1 + .github/workflows/perl-openwsman.yml | 3 +++ .github/workflows/perl-vmware-vsphere.yml | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index b4b22254a..24e991ba2 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -140,7 +140,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index ec1fcf7e4..73f92cd97 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -114,6 +114,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 354db9296..d4728367a 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -101,6 +101,7 @@ jobs: nfpm_file_pattern: "dependencies/perl-json-path/perl-json-path.yaml" distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} + release: ${{ needs.get-environment.outputs.release }} arch: all commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 14df078a1..762446d8f 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -112,6 +112,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 05262203f..0002191ea 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -113,6 +113,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} + release: ${{ needs.get-environment.outputs.release }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 98f30f09f..b490bbd60 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -151,6 +151,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} @@ -165,6 +166,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} @@ -179,6 +181,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: ${{ needs.get-environment.outputs.release }} commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 542db54d3..0a26d3fd7 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -91,6 +91,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} commit_hash: ${{ github.sha }} + release: ${{ needs.get-environment.outputs.release }} cache_key: ${{ github.sha }}-${{ github.run_id }}-${{ matrix.package_extension }}-${{ matrix.distrib }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} From 93d9b4aac1ecf319903bf50306777f95a861f21a Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 11:51:05 +0100 Subject: [PATCH 10/26] Revert "Revert "[to revert] forced unstable stability on delivery"" This reverts commit f6e076e6401b8aed8cb3bd5907768fc9551bba66. --- .github/workflows/connector-vmware.yml | 2 +- .github/workflows/nrpe.yml | 2 +- .github/workflows/perl-cpan-libraries.yml | 2 +- .github/workflows/perl-crypt-argon2.yml | 2 +- .github/workflows/perl-filesys-smbclient.yml | 2 +- .github/workflows/perl-json-path.yml | 2 +- .github/workflows/perl-keepass-reader.yml | 2 +- .github/workflows/perl-libssh-session.yml | 2 +- .github/workflows/perl-net-curl.yml | 2 +- .github/workflows/perl-openwsman.yml | 6 +++--- .github/workflows/perl-vmware-vsphere.yml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index a57a4bfd5..27544a042 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -116,5 +116,5 @@ jobs: module_name: connector-vmware distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 24e991ba2..5b6596da9 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -152,5 +152,5 @@ jobs: module_name: nrpe distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index 54b8a9c88..d269963d8 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -360,7 +360,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 73f92cd97..0c11274cb 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -183,7 +183,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index e15780832..eb1159ca4 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -187,7 +187,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index d4728367a..7cc936332 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -165,7 +165,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index d5e4634f9..02821848c 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -195,7 +195,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index 762446d8f..b13e5425f 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -181,7 +181,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 0002191ea..8417a8fd0 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -181,7 +181,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index b490bbd60..45e2757f5 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -259,7 +259,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable - name: Delivery libwsman uses: ./.github/actions/deb-delivery @@ -268,7 +268,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable - name: Delivery perl-openwsman uses: ./.github/actions/deb-delivery @@ -277,7 +277,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable promote: needs: [get-environment] diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 0a26d3fd7..f9825f795 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -143,5 +143,5 @@ jobs: module_name: perl-vmware-vsphere distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} From c002c324b2a5519d744089a0b96acb7879a5b73e Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 14:40:00 +0100 Subject: [PATCH 11/26] variabilized release field of several nfpm file patterns --- .github/workflows/perl-net-curl.yml | 2 +- dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml | 2 +- dependencies/perl-json-path/perl-json-path.yaml | 2 +- dependencies/perl-libssh-session/perl-libssh-session.yaml | 2 +- dependencies/perl-net-curl/perl-net-curl.yaml | 2 +- dependencies/perl-openwsman/libwsman.yaml | 2 +- dependencies/perl-openwsman/perl-openwsman.yaml | 2 +- dependencies/perl-openwsman/sblim-sfcc.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 8417a8fd0..6d6c968d3 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -126,7 +126,7 @@ jobs: uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: packages-${{ matrix.distrib }}-${{ matrix.arch }} - path: ./*.${{ matrix.package_extension}} + path: ./*.${{ matrix.package_extension }} retention-days: 1 deliver-rpm: diff --git a/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml b/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml index 57945b531..943d069dd 100644 --- a/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml +++ b/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "0.019" -release: "2${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-json-path/perl-json-path.yaml b/dependencies/perl-json-path/perl-json-path.yaml index d44ed290a..8d968c366 100644 --- a/dependencies/perl-json-path/perl-json-path.yaml +++ b/dependencies/perl-json-path/perl-json-path.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "@VERSION@" -release: "2${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-libssh-session/perl-libssh-session.yaml b/dependencies/perl-libssh-session/perl-libssh-session.yaml index b63ba2796..a1f9c7116 100644 --- a/dependencies/perl-libssh-session/perl-libssh-session.yaml +++ b/dependencies/perl-libssh-session/perl-libssh-session.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "0.8" -release: "3${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-net-curl/perl-net-curl.yaml b/dependencies/perl-net-curl/perl-net-curl.yaml index 7648ba9e2..61cdfccf6 100644 --- a/dependencies/perl-net-curl/perl-net-curl.yaml +++ b/dependencies/perl-net-curl/perl-net-curl.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "0.54" -release: "2${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-openwsman/libwsman.yaml b/dependencies/perl-openwsman/libwsman.yaml index 4af6428b4..637fe8395 100644 --- a/dependencies/perl-openwsman/libwsman.yaml +++ b/dependencies/perl-openwsman/libwsman.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "@VERSION@" -release: "1${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-openwsman/perl-openwsman.yaml b/dependencies/perl-openwsman/perl-openwsman.yaml index 08572463a..b30faae46 100644 --- a/dependencies/perl-openwsman/perl-openwsman.yaml +++ b/dependencies/perl-openwsman/perl-openwsman.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "@VERSION@" -release: "3${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-openwsman/sblim-sfcc.yaml b/dependencies/perl-openwsman/sblim-sfcc.yaml index a3be033e7..fe6cf25c8 100644 --- a/dependencies/perl-openwsman/sblim-sfcc.yaml +++ b/dependencies/perl-openwsman/sblim-sfcc.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "2.7.2" -release: "1${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " From 21b8eea96711aac701403976be539a6db63ec3b7 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 14:52:30 +0100 Subject: [PATCH 12/26] hardcoded release numbers on updated perl dependencies --- .github/workflows/perl-crypt-argon2.yml | 2 +- .github/workflows/perl-json-path.yml | 2 +- .github/workflows/perl-libssh-session.yml | 2 +- .github/workflows/perl-net-curl.yml | 2 +- .github/workflows/perl-openwsman.yml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 0c11274cb..4415972f1 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -114,7 +114,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} - release: ${{ needs.get-environment.outputs.release }} + release: 3 commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 7cc936332..758ca19e3 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -101,7 +101,7 @@ jobs: nfpm_file_pattern: "dependencies/perl-json-path/perl-json-path.yaml" distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} - release: ${{ needs.get-environment.outputs.release }} + release: 3 arch: all commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index b13e5425f..afd15a937 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -112,7 +112,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} - release: ${{ needs.get-environment.outputs.release }} + release: 4 commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 6d6c968d3..4ed0a32d6 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -113,7 +113,7 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - release: ${{ needs.get-environment.outputs.release }} + release: 3 cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 45e2757f5..7f500bc81 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -151,7 +151,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} - release: ${{ needs.get-environment.outputs.release }} + release: 2 commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} @@ -166,7 +166,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} - release: ${{ needs.get-environment.outputs.release }} + release: 2 commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} @@ -181,7 +181,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} - release: ${{ needs.get-environment.outputs.release }} + release: 4 commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} From 0b0f589f665dfe27d42a46030f18e35ec8453fca Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 15:25:10 +0100 Subject: [PATCH 13/26] deliver unstable plugins --- .github/workflows/plugins.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 1a73f48fb..5ee1f7f3e 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -233,12 +233,12 @@ jobs: deliver: needs: [get-environment, package] - if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} uses: ./.github/workflows/plugin-delivery.yml with: version: ${{ needs.get-environment.outputs.version }} release: ${{ needs.get-environment.outputs.release }} - stability: ${{ needs.get-environment.outputs.stability }} + stability: unstable secrets: artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} token_download_centreon_com: ${{ secrets.TOKEN_DOWNLOAD_CENTREON_COM }} From a0609d0455b340ecd3ed5a19ad1710b1392215a6 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 15:26:02 +0100 Subject: [PATCH 14/26] trigger plugin package delivery --- src/centreon/plugins/dbi.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/centreon/plugins/dbi.pm b/src/centreon/plugins/dbi.pm index 3c1ec57f5..6e9309bc3 100644 --- a/src/centreon/plugins/dbi.pm +++ b/src/centreon/plugins/dbi.pm @@ -207,6 +207,7 @@ sub is_version_minimum { return 1; } + sub set_version { my ($self) = @_; From c37ef0d702648520527454e2ba68bf507c3ff874 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 15:34:44 +0100 Subject: [PATCH 15/26] forget about plugins, it's cpan-librairies that causes the issue --- .github/workflows/plugins.yml | 4 ++-- src/centreon/plugins/dbi.pm | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 5ee1f7f3e..1a73f48fb 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -233,12 +233,12 @@ jobs: deliver: needs: [get-environment, package] - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} uses: ./.github/workflows/plugin-delivery.yml with: version: ${{ needs.get-environment.outputs.version }} release: ${{ needs.get-environment.outputs.release }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} secrets: artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} token_download_centreon_com: ${{ secrets.TOKEN_DOWNLOAD_CENTREON_COM }} diff --git a/src/centreon/plugins/dbi.pm b/src/centreon/plugins/dbi.pm index 6e9309bc3..3c1ec57f5 100644 --- a/src/centreon/plugins/dbi.pm +++ b/src/centreon/plugins/dbi.pm @@ -207,7 +207,6 @@ sub is_version_minimum { return 1; } - sub set_version { my ($self) = @_; From f4c50bd91959ba16c2bb782f5a352d34c7861d1c Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Tue, 30 Jan 2024 16:25:23 +0100 Subject: [PATCH 16/26] reverted perl dependencies workflows trigger --- .github/workflows/connector-vmware.yml | 4 ++-- .github/workflows/nrpe.yml | 4 ++-- .github/workflows/perl-cpan-libraries.yml | 4 ++-- .github/workflows/perl-crypt-argon2.yml | 4 ++-- .github/workflows/perl-filesys-smbclient.yml | 4 ++-- .github/workflows/perl-json-path.yml | 4 ++-- .github/workflows/perl-keepass-reader.yml | 4 ++-- .github/workflows/perl-libssh-session.yml | 4 ++-- .github/workflows/perl-net-curl.yml | 4 ++-- .github/workflows/perl-openwsman.yml | 8 ++++---- .github/workflows/perl-vmware-vsphere.yml | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 27544a042..bfe97edcb 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -99,7 +99,7 @@ jobs: needs: - get-environment - package - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -116,5 +116,5 @@ jobs: module_name: connector-vmware distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 5b6596da9..91c4df9e4 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -135,7 +135,7 @@ jobs: deliver-deb: needs: [get-environment, package] - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -152,5 +152,5 @@ jobs: module_name: nrpe distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index d269963d8..9b27b0ec5 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -342,7 +342,7 @@ jobs: deliver-deb: needs: [get-environment, download-and-cache-deb] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -360,7 +360,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 4415972f1..60d9327cb 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -157,7 +157,7 @@ jobs: deliver-deb: needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -183,7 +183,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index eb1159ca4..6b5edbbae 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -169,7 +169,7 @@ jobs: deliver-deb: needs: [get-environment, package-deb] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -187,7 +187,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 758ca19e3..998f1c7a1 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -145,7 +145,7 @@ jobs: deliver-deb: needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -165,7 +165,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index 02821848c..f653ed14c 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -177,7 +177,7 @@ jobs: deliver-deb: needs: [get-environment, package-deb] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -195,7 +195,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index afd15a937..68d2e916d 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -155,7 +155,7 @@ jobs: deliver-deb: needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -181,7 +181,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 4ed0a32d6..dab970e40 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -155,7 +155,7 @@ jobs: deliver-deb: needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -181,7 +181,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 7f500bc81..ff8af0d50 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -233,7 +233,7 @@ jobs: deliver-deb: needs: [get-environment, package] - # if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -259,7 +259,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} - name: Delivery libwsman uses: ./.github/actions/deb-delivery @@ -268,7 +268,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} - name: Delivery perl-openwsman uses: ./.github/actions/deb-delivery @@ -277,7 +277,7 @@ jobs: distrib: ${{ matrix.distrib }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} cache_key: cache-${{ github.sha }}-deb-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} promote: needs: [get-environment] diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index f9825f795..7c9152d92 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -126,7 +126,7 @@ jobs: needs: - get-environment - package - # if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} + if: ${{ contains(fromJson('["stable", "testing", "unstable"]'), needs.get-environment.outputs.stability) }} runs-on: [self-hosted, common] strategy: @@ -143,5 +143,5 @@ jobs: module_name: perl-vmware-vsphere distrib: ${{ matrix.distrib }} cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-${{ matrix.distrib }} - stability: unstable + stability: ${{ needs.get-environment.outputs.stability }} artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} From 66ca30ead3e6ed8e9e7e50c8ccfb124f74ec15af Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 10:45:09 +0100 Subject: [PATCH 17/26] Update .github/workflows/perl-openwsman.yml Co-authored-by: Kevin Duret --- .github/workflows/perl-openwsman.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index ff8af0d50..03bd40798 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -166,7 +166,7 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} - release: 2 + release: 4 commit_hash: ${{ github.sha }} cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} From b271fa564b7e7e55735de66aa5c98f2099546924 Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:05:51 +0100 Subject: [PATCH 18/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index b92868702..1de35f098 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -95,7 +95,7 @@ runs: if [[ "$MAJOR_VERSION" != "" ]]; then MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 ) MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) - if [ "$MAJOR_RIGHT" = "04" ]; then + if [ "$MAJOR_RIGHT" == "04" ]; then BUMP_MAJOR_LEFT="$MAJOR_LEFT" BUMP_MAJOR_RIGHT="10" else From 77553e501ede1aaf9ffb720d3ff3ed3aa8f29e70 Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:07:15 +0100 Subject: [PATCH 19/26] Update action.yml --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 1de35f098..77b9c1dd7 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -92,7 +92,7 @@ runs: export APACHE_GROUP="www-data" fi - if [[ "$MAJOR_VERSION" != "" ]]; then + if [ -z "$MAJOR_VERSION" ]; then MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 ) MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) if [ "$MAJOR_RIGHT" == "04" ]; then From 92336edfc3765fe76da0884653e22b52e688ec0b Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:49:28 +0100 Subject: [PATCH 20/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 77b9c1dd7..ae5d9f64b 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -71,7 +71,7 @@ runs: export MINOR_VERSION="${{ inputs.minor_version }}" elif [ -z ${{ inputs.major_version }} ]; then export VERSION="${{ inputs.version }}" - export MAJOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f1 ) + export MAJOR_VERSION=$( echo $VERSION | cut -d "-" -f1 ) export MINOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f2 ) fi export RELEASE="${{ inputs.release }}" From be4702b0afa363efb710ca15d083a45b97bff694 Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:49:38 +0100 Subject: [PATCH 21/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index ae5d9f64b..4f7c60a5c 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -72,7 +72,7 @@ runs: elif [ -z ${{ inputs.major_version }} ]; then export VERSION="${{ inputs.version }}" export MAJOR_VERSION=$( echo $VERSION | cut -d "-" -f1 ) - export MINOR_VERSION=$( echo $MAJOR_VERSION | cut -d "-" -f2 ) + export MINOR_VERSION=$( echo $VERSION | cut -d "-" -f2 ) fi export RELEASE="${{ inputs.release }}" export ARCH="${{ inputs.arch }}" From b7f387b1b10c7f341c0faf6a848ab0b1819ea010 Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:49:50 +0100 Subject: [PATCH 22/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 4f7c60a5c..4b842e7a8 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -83,7 +83,7 @@ runs: export APACHE_GROUP="apache" else export DIST="" - if [ "${{ inputs.stability }}" = "unstable" ] || [ "${{ inputs.stability }}" = "canary" ]; then + if [ "${{ inputs.stability }}" == "unstable" ] || [ "${{ inputs.stability }}" == "canary" ]; then export RELEASE="$RELEASE~${{ inputs.distrib }}" elif [ "${{ inputs.stability }}" = "testing" ]; then export RELEASE="1~${{ inputs.distrib }}" From 534f03e05d734683bf94e6579926753e57807d4a Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:49:57 +0100 Subject: [PATCH 23/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 4b842e7a8..b4af4ac00 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -85,7 +85,7 @@ runs: export DIST="" if [ "${{ inputs.stability }}" == "unstable" ] || [ "${{ inputs.stability }}" == "canary" ]; then export RELEASE="$RELEASE~${{ inputs.distrib }}" - elif [ "${{ inputs.stability }}" = "testing" ]; then + elif [ "${{ inputs.stability }}" == "testing" ]; then export RELEASE="1~${{ inputs.distrib }}" fi export APACHE_USER="www-data" From 2086cc976a7d18c30bdff0874eee721a3877eb51 Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:51:16 +0100 Subject: [PATCH 24/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index b4af4ac00..8a6c2c455 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -93,7 +93,7 @@ runs: fi if [ -z "$MAJOR_VERSION" ]; then - MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 ) + MAJOR_LEFT=$( echo $VERSION | cut -d "." -f1 ) MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) if [ "$MAJOR_RIGHT" == "04" ]; then BUMP_MAJOR_LEFT="$MAJOR_LEFT" From 9d425c83d9ec25813d63478863cbab6366c59749 Mon Sep 17 00:00:00 2001 From: May <110405507+paul-oureib@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:51:30 +0100 Subject: [PATCH 25/26] Update .github/actions/package-nfpm/action.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com> --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 8a6c2c455..3be47f15b 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -94,7 +94,7 @@ runs: if [ -z "$MAJOR_VERSION" ]; then MAJOR_LEFT=$( echo $VERSION | cut -d "." -f1 ) - MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) + MAJOR_RIGHT=$( echo $VERSION | cut -d "-" -f1 | cut -d "." -f2 ) if [ "$MAJOR_RIGHT" == "04" ]; then BUMP_MAJOR_LEFT="$MAJOR_LEFT" BUMP_MAJOR_RIGHT="10" From eb3fab213c3f619003dcd99901d5085cd351aac5 Mon Sep 17 00:00:00 2001 From: Paul Oureib Date: Wed, 31 Jan 2024 16:54:09 +0100 Subject: [PATCH 26/26] package release number was mandatory after all --- .github/actions/package-nfpm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index b4af4ac00..00fdd25e1 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -21,7 +21,7 @@ inputs: required: false release: description: The package release number - required: false + required: true arch: description: The package architecture required: false