tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doubled bullseye usage with bookworm

This commit is contained in:
Paul Oureib 2024-01-15 10:30:56 +01:00
parent 03bd824abe
commit 45b33fe720
18 changed files with 82 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/deb-delivery/action.yml vendored
View File

@ -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

2
.github/actions/package/action.yml vendored
View File

@ -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:

2
.github/actions/promote-to-stable/action.yml vendored
View File

@ -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 }}"

4
.github/actions/rpm-delivery/action.yml vendored
View File

@ -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

2
.github/workflows/connector-vmware.yml vendored
View File

@ -104,7 +104,7 @@ jobs:
strategy:
matrix:
distrib: [bullseye]
distrib: [bullseye, bookworm]
steps:
- name: Checkout sources

3
.github/workflows/docker-builder-packaging-plugins.yml vendored
View File

@ -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 }}

2
.github/workflows/get-environment.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
develop)
STABILITY="unstable"
;;
release* | hotfix*)
release* | hotfix* | MON-34064*)
STABILITY="testing"
;;
master)

20
.github/workflows/perl-cpan-libraries.yml vendored
View File

@ -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

13
.github/workflows/perl-crypt-argon2.yml vendored
View File

@ -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

6
.github/workflows/perl-filesys-smbclient.yml vendored
View File

@ -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

12
.github/workflows/perl-json-path.yml vendored
View File

@ -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

6
.github/workflows/perl-keepass-reader.yml vendored
View File

@ -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

6
.github/workflows/perl-libssh-session.yml vendored
View File

@ -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

13
.github/workflows/perl-net-curl.yml vendored
View File

@ -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

20
.github/workflows/perl-openwsman.yml vendored
View File

@ -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 }}

2
.github/workflows/perl-vmware-vsphere.yml vendored
View File

@ -130,7 +130,7 @@ jobs:
strategy:
matrix:
distrib: [bullseye]
distrib: [bullseye, bookworm]
steps:
- name: Checkout sources

2
.github/workflows/plugin-delivery.yml vendored
View File

@ -96,7 +96,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [bullseye]
distrib: [bullseye, bookworm]
steps:
- name: Checkout sources

1
.github/workflows/plugins-selinux.yml vendored
View File

@ -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) }}