Skip to content

Commit

Permalink
add jammy distribution in pipelines & docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
mushroomempires committed Jan 31, 2024
1 parent 10740a7 commit 20a5606
Show file tree
Hide file tree
Showing 16 changed files with 143 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/actions/promote-to-stable/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ runs:
shell: bash

- name: Promote DEB package to stable
if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' }}
if: ${{ startsWith(inputs.distrib, 'bullseye') || startsWith(inputs.distrib, 'bookworm' || startsWith(inputs.disttrib, 'jammy') }}
run: |
echo "[DEBUG] - Distrib: ${{ inputs.distrib }}"
Expand Down
53 changes: 53 additions & 0 deletions .github/docker/Dockerfile.packaging-plugins-jammy
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
ARG REGISTRY_URL

FROM ${REGISTRY_URL}/ubuntu:jammy

ENV DEBIAN_FRONTEND noninteractive

# fix locale
RUN bash -e <<EOF

apt-get update
apt-get install -y locales
rm -rf /var/lib/apt/lists/*
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
apt-get clean

EOF

ENV LANG en_US.utf8

RUN bash -e <<EOF

apt-get update

echo 'http://deb.debian.org/debian' | apt-get install -y pbuilder

apt-get install -y \
dh-make \
aptitude \
ca-certificates \
libssh-dev \
lintian \
quilt \
git-buildpackage \
debmake \
devscripts \
fakeroot \
curl \
gcc \
git \
python3 \
libjson-perl \
libapp-fatpacker-perl \
libfile-copy-recursive-perl \
jq \
zstd

echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
apt-get update
apt-get install -y nfpm

apt-get clean

EOF
3 changes: 3 additions & 0 deletions .github/workflows/connector-vmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ jobs:
- package_extension: deb
image: packaging-plugins-bookworm
distrib: bookworm
- package_extension: deb
image: packaging-plugins-jammy
distrib: jammy

container:
image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docker-builder-packaging-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ jobs:
- runner: ubuntu-22.04
dockerfile: packaging-plugins-bookworm
image: packaging-plugins-bookworm
- runner: ubuntu-22.04
dockerfile: packaging-plugins-jammy
image: packaging-plugins-jammy

runs-on: ${{ matrix.runner }}

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/nrpe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
- package_extension: deb
image: packaging-plugins-bookworm
distrib: bookworm
- package_extension: deb
image: packaging-plugins-jammy
distrib: jammy

container:
image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/perl-cpan-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bullseye, bookworm]
distrib: [el8, el9, bullseye, bookworm, jammy]
name:
[
"Authen::SASL::SASLprep",
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
"ZMQ::LibZMQ4"
]
include:
- build_distribs: "el8,el9,bullseye,bookworm"
- build_distribs: "el8,el9,bullseye,bookworm,jammy"
- rpm_dependencies: ""
- deb_dependencies: ""
- rpm_provides: ""
Expand All @@ -117,6 +117,9 @@ jobs:
- distrib: bookworm
package_extension: deb
image: packaging-plugins-bookworm
- distrib: jammy
package_extension: deb
image: packaging-plugins-jammy
- 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)"
Expand Down Expand Up @@ -148,7 +151,7 @@ jobs:
build_distribs: "el8,el9"
version: "0.31"
- name: "ZMQ::Constants"
build_distribs: "el9,bullseye,bookworm"
build_distribs: "el9,bullseye,bookworm,jammy"
- name: "ZMQ::FFI"
build_distribs: "el8,el9"
rpm_dependencies: "zeromq"
Expand Down Expand Up @@ -306,7 +309,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
distrib: [bullseye, bookworm]
distrib: [bullseye, bookworm, jammy]
steps:
- uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
with:
Expand Down Expand Up @@ -347,7 +350,7 @@ jobs:

strategy:
matrix:
distrib: [bullseye, bookworm]
distrib: [bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand All @@ -368,7 +371,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm]
distrib: [el8, el9, bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/perl-crypt-argon2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ jobs:
package_extension: deb
runner: ubuntu-22.04
arch: amd64
- image: packaging-plugins-jammy
distrib: jammy
package_extension: deb
runner: ubuntu-22.04
arch: amd64
- image: packaging-plugins-bullseye-arm64
distrib: bullseye
package_extension: deb
Expand All @@ -73,7 +78,7 @@ jobs:

- name: Install locally Crypt::Argon2
run: |
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
apt-get update
apt-get install -y cpanminus gcc
else
Expand All @@ -85,7 +90,7 @@ jobs:

- name: Set package name and paths according to distrib
run: |
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
NAME="libcrypt-argon2-perl"
if [ "${{ matrix.arch }}" = "amd64" ]; then
PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
Expand Down Expand Up @@ -165,6 +170,8 @@ jobs:
arch: amd64
- distrib: bookworm
arch: amd64
- distrib: jammy
arch: amd64
- distrib: bullseye
arch: arm64

Expand Down Expand Up @@ -198,6 +205,8 @@ jobs:
arch: amd64
- distrib: bookworm
arch: amd64
- distrib: jammy
arch: amd64
- distrib: bullseye
arch: arm64

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/perl-filesys-smbclient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ jobs:
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
Expand Down Expand Up @@ -174,7 +176,7 @@ jobs:

strategy:
matrix:
distrib: [bullseye, bookworm]
distrib: [bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand All @@ -195,7 +197,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm]
distrib: [el8, el9, bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/perl-json-path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
- image: packaging-plugins-bookworm
distrib: bookworm
package_extension: deb
- image: packaging-plugins-jammy
distrib: jammy
package_extension: deb

runs-on: ubuntu-22.04

Expand All @@ -58,7 +61,7 @@ jobs:

- name: Install locally JSON::Path
run: |
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
apt-get update
apt-get install -y cpanminus gcc
else
Expand All @@ -75,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" ]; then
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
NAME="libjson-path-perl"
PERL_VENDORLIB="/usr/share/perl5"
else
Expand Down Expand Up @@ -148,7 +151,7 @@ jobs:

strategy:
matrix:
distrib: [bullseye, bookworm]
distrib: [bullseye, bookworm, jammy]

name: Deliver ${{ matrix.distrib }}

Expand All @@ -171,7 +174,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [bullseye, bookworm]
distrib: [bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/perl-keepass-reader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ jobs:
distrib: bullseye
- image: bookworm
distrib: bookworm
- image: jammy
distrib: jammy
name: package ${{ matrix.distrib }}
container:
image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/packaging-plugins-${{ matrix.image }}:latest
Expand Down Expand Up @@ -182,7 +184,7 @@ jobs:

strategy:
matrix:
distrib: [bullseye, bookworm]
distrib: [bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand All @@ -203,7 +205,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm]
distrib: [el8, el9, bullseye, bookworm, jammy]

steps:
- name: Checkout sources
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/perl-libssh-session.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ jobs:
package_extension: deb
runner: ubuntu-22.04
arch: amd64
- image: packaging-plugins-jammy
distrib: jammy
package_extension: deb
runner: ubuntu-22.04
arch: amd64
- image: packaging-plugins-bullseye-arm64
distrib: bullseye
package_extension: deb
Expand All @@ -71,7 +76,7 @@ jobs:

- name: Install locally Libssh::Session
run: |
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" || [ "${{ matrix.distrib }}" = "jammy" ]; then
apt-get update
apt-get install -y cpanminus gcc libssh-dev
else
Expand All @@ -83,7 +88,7 @@ jobs:

- name: Set package name and paths according to distrib
run: |
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ]; then
if [ "${{ matrix.distrib }}" = "bullseye" ] || [ "${{ matrix.distrib }}" = "bookworm" ] || [ "${{ matrix.distrib }}" = "jammy" ]; then
NAME="libssh-session-perl"
if [ "${{ matrix.arch }}" = "amd64" ]; then
PERL_VENDORARCH="/usr/lib/x86_64-linux-gnu/perl5/5.32"
Expand Down Expand Up @@ -165,6 +170,8 @@ jobs:
arch: arm64
- distrib: bookworm
arch: amd64
- distrib: jammy
arch: amd64

name: Deliver ${{ matrix.distrib }} ${{ matrix.arch }}

Expand Down Expand Up @@ -196,6 +203,8 @@ jobs:
arch: amd64
- distrib: bookworm
arch: amd64
- distrib: jammy
arch: amd64
- distrib: bullseye
arch: arm64

Expand Down
Loading

0 comments on commit 20a5606

Please sign in to comment.