diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml index 5af1b4eeb7..dca92f2b68 100644 --- a/.github/actions/deb-delivery/action.yml +++ b/.github/actions/deb-delivery/action.yml @@ -40,11 +40,17 @@ runs: run: | FILES="*.deb" + if [[ "${{ inputs.distrib }}" == "jammy" ]]; then + REPO_PREFIX="ubuntu" + else + REPO_PREFIX="apt" + fi + for FILE in $FILES; do echo "[DEBUG] - File: $FILE" 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" "${REPO_PREFIX}-plugins-${{ inputs.stability }}/pool/${{ inputs.module_name }}/" --deb "${{ inputs.distrib }}/main/$ARCH" done shell: bash diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 2fa17f036e..1fcfb77432 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -107,7 +107,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index 68722820d9..c51017cddd 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -143,7 +143,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml index c5a642184e..c4c3cc3f06 100644 --- a/.github/workflows/perl-cpan-libraries.yml +++ b/.github/workflows/perl-cpan-libraries.yml @@ -434,7 +434,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 224ceb4c38..9f183d7f9f 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -78,7 +78,7 @@ jobs: - name: Install locally Crypt::Argon2 run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt-get update apt-get install -y cpanminus gcc else @@ -90,7 +90,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then NAME="libcrypt-argon2-perl" if [ "${{ matrix.arch }}" = "amd64" ]; then PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32" @@ -172,6 +172,8 @@ jobs: arch: amd64 - distrib: bookworm arch: amd64 + - distrib: jammy + arch: amd64 - distrib: bullseye arch: arm64 diff --git a/.github/workflows/perl-filesys-smbclient.yml b/.github/workflows/perl-filesys-smbclient.yml index 9518008e14..9d92daf0c5 100644 --- a/.github/workflows/perl-filesys-smbclient.yml +++ b/.github/workflows/perl-filesys-smbclient.yml @@ -118,10 +118,6 @@ jobs: include: - image: packaging-plugins-bullseye distrib: bullseye - - image: packaging-plugins-bookworm - distrib: bookworm - - image: packaging-plugins-jammy - distrib: jammy name: package ${{ matrix.distrib }} container: image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest @@ -176,7 +172,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye] steps: - name: Checkout sources @@ -197,7 +193,7 @@ jobs: runs-on: [self-hosted, common] strategy: matrix: - distrib: [el8, el9, bullseye, bookworm] + distrib: [el8, el9, bullseye] steps: - name: Checkout sources diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index 04cbd59e9f..d57120950b 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -61,7 +61,7 @@ jobs: - name: Install locally JSON::Path run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt-get update apt-get install -y cpanminus gcc else @@ -78,7 +78,7 @@ jobs: - name: Set package name and paths according to distrib run: | VERSION="1.0.3" - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then NAME="libjson-path-perl" PERL_VENDORLIB="/usr/share/perl5" else diff --git a/.github/workflows/perl-keepass-reader.yml b/.github/workflows/perl-keepass-reader.yml index 634bd1b540..16d5a422b0 100644 --- a/.github/workflows/perl-keepass-reader.yml +++ b/.github/workflows/perl-keepass-reader.yml @@ -184,7 +184,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index bf0c20f3ab..a9e515f165 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -76,7 +76,7 @@ jobs: - name: Install locally Libssh::Session run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt-get update apt-get install -y cpanminus gcc libssh-dev else @@ -88,7 +88,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then NAME="libssh-session-perl" if [ "${{ matrix.arch }}" = "amd64" ]; then PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32" @@ -172,6 +172,8 @@ jobs: arch: arm64 - distrib: bookworm arch: amd64 + - distrib: jammy + arch: amd64 name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }} diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index d4be259d2f..0323c26508 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -76,7 +76,7 @@ jobs: - name: Install locally Net::Curl run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt-get update apt-get install -y libcurl4-openssl-dev cpanminus gcc else @@ -88,7 +88,7 @@ jobs: - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then NAME="libnet-curl-perl" if [ "${{ matrix.arch }}" = "amd64" ]; then PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32" @@ -170,6 +170,8 @@ jobs: arch: amd64 - distrib: bookworm arch: amd64 + - distrib: jammy + arch: amd64 - distrib: bullseye arch: arm64 diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 711a996eb4..c664655c47 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -80,7 +80,7 @@ jobs: - name: Install locally sblim-sfcc run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then apt-get update apt-get install -y libcurl4-openssl-dev cd /tmp @@ -103,7 +103,7 @@ jobs: - name: Build openwsman run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; 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 @@ -116,10 +116,11 @@ jobs: cd build cmake .. -DBUILD_PYTHON=No -DBUILD_PYTHON3=No -DBUILD_JAVA=No -DBUILD_RUBY=No -DBUILD_PERL=Yes make + shell: bash - name: Set package name and paths according to distrib run: | - if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then + if [[ "${{ matrix.package_extension }}" == "deb" ]]; then NAME_PERL="libopenwsman-perl" USRLIB="/usr/lib/" if [ "${{ matrix.arch }}" = "amd64" ]; then @@ -150,7 +151,7 @@ jobs: shell: bash - name: Package sblim-sfcc - if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' || matrix.distrib == 'jammy' }} + if: ${{ matrix.package_extension == 'deb' }} uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "dependencies/perl-openwsman/sblim-sfcc.yaml" @@ -249,6 +250,8 @@ jobs: arch: amd64 - distrib: bookworm arch: amd64 + - distrib: jammy + arch: amd64 - distrib: bullseye arch: arm64 @@ -308,7 +311,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Promote sblim-sfcc ${{ matrix.distrib }} ${{ matrix.arch }} to stable - if: ${{ matrix.distrib == 'bullseye' || matrix.distrib == 'bookworm' || matrix.distrib == 'jammy' }} + if: ${{ contains(fromJSON('["bullseye", "bookworm", "jammy"]'), matrix.distrib) }} uses: ./.github/actions/promote-to-stable with: artifactory_token: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 964ded427b..caa7d2da15 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -134,7 +134,7 @@ jobs: strategy: matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye, bookworm, jammy] steps: - name: Checkout sources diff --git a/.github/workflows/plugin-delivery.yml b/.github/workflows/plugin-delivery.yml index be4919159b..dd9509bd6e 100644 --- a/.github/workflows/plugin-delivery.yml +++ b/.github/workflows/plugin-delivery.yml @@ -96,7 +96,7 @@ jobs: strategy: fail-fast: false matrix: - distrib: [bullseye, bookworm] + distrib: [bullseye, bookworm, jammy] steps: - name: Checkout sources