From c8a1c697fc8fb838502cd4568f5fe9c7686ff341 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Thu, 4 Jul 2024 21:00:07 +0200 Subject: [PATCH] ci: fix packit config also add C10s containerfile. --- .packit.yml | 25 ++++---- test/container/Dockerfile-Arch | 52 ---------------- test/container/Dockerfile-CentOS-10-Stream | 56 +++++++++++++++++ test/container/Dockerfile-Debian | 66 -------------------- test/container/Dockerfile-Fedora-latest | 71 ---------------------- test/container/Dockerfile-Gentoo | 59 ------------------ test/container/Dockerfile-OpenSuse-latest | 52 ---------------- test/container/Dockerfile-Ubuntu | 67 -------------------- test/container/Dockerfile-Void | 64 ------------------- test/container/Dockerfile-alpine | 62 ------------------- 10 files changed, 68 insertions(+), 506 deletions(-) delete mode 100644 test/container/Dockerfile-Arch create mode 100644 test/container/Dockerfile-CentOS-10-Stream delete mode 100644 test/container/Dockerfile-Debian delete mode 100644 test/container/Dockerfile-Fedora-latest delete mode 100644 test/container/Dockerfile-Gentoo delete mode 100644 test/container/Dockerfile-OpenSuse-latest delete mode 100644 test/container/Dockerfile-Ubuntu delete mode 100644 test/container/Dockerfile-Void delete mode 100644 test/container/Dockerfile-alpine diff --git a/.packit.yml b/.packit.yml index 7c9ca5011..1128bf86f 100644 --- a/.packit.yml +++ b/.packit.yml @@ -23,29 +23,28 @@ downstream_package_name: dracut # - "cp pkgbuild/dracut.spec ." jobs: -# Build test -- job: upstream_koji_build - trigger: pull_request - scratch: true - targets: - - fedora-rawhide-x86_64 - - fedora-eln-x86_64 +#- job: upstream_koji_build +# trigger: pull_request +# scratch: true +# targets: +# - fedora-rawhide-x86_64 +# - fedora-eln-x86_64 - job: copr_build trigger: pull_request targets: - - fedora-rawhide-x86_64 - - fedora-eln-x86_64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 # Run tests (via testing farm) - job: tests trigger: pull_request targets: - - fedora-rawhide-x86_64 -# - fedora-eln-x86_64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 -## Create fedora PR +## Create PR #- job: propose_downstream # trigger: release # dist_git_branches: -# - rawhide +# - diff --git a/test/container/Dockerfile-Arch b/test/container/Dockerfile-Arch deleted file mode 100644 index 2af810a0c..000000000 --- a/test/container/Dockerfile-Arch +++ /dev/null @@ -1,52 +0,0 @@ -FROM docker.io/archlinux - -RUN pacman --noconfirm -Syu \ - asciidoc \ - astyle \ - base-devel \ - bluez \ - btrfs-progs \ - busybox \ - cargo \ - cifs-utils \ - connman \ - cpio \ - dash \ - dhclient \ - dhcp \ - dmraid \ - elfutils \ - f2fs-tools \ - git \ - glibc \ - jq \ - linux \ - lvm2 \ - lzop \ - mdadm \ - multipath-tools \ - nbd \ - networkmanager \ - nfsidmap \ - nfs-utils \ - ntfs-3g \ - nvme-cli \ - open-iscsi \ - openssh \ - parted \ - pigz \ - plymouth \ - qemu \ - qrencode \ - rng-tools \ - sbsigntools \ - shellcheck \ - shfmt \ - squashfs-tools \ - strace \ - systemd-ukify \ - tcpdump \ - tgt \ - tpm2-tools \ - vi \ - && yes | pacman -Scc diff --git a/test/container/Dockerfile-CentOS-10-Stream b/test/container/Dockerfile-CentOS-10-Stream new file mode 100644 index 000000000..cdfcee5ca --- /dev/null +++ b/test/container/Dockerfile-CentOS-10-Stream @@ -0,0 +1,56 @@ +FROM quay.io/centos/centos:stream10 + +MAINTAINER https://github.com/redhat-plumbers/dracut-rhel10 + +ENV container docker +LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e NAME=NAME -e IMAGE=IMAGE IMAGE" + +RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh + +# Install needed packages for the dracut CI container +# FIXME: properly re-add dash once C10S EPEL is available +# http://mirrors.kernel.org/fedora/releases/34/Everything/x86_64/os/Packages/d/dash-0.5.10.2-8.fc34.x86_64.rpm \ +RUN dnf -y install --enablerepo crb --setopt=install_weak_deps=False \ + qemu-kvm \ + NetworkManager \ + asciidoc \ + bash-completion \ + bzip2 \ + cryptsetup \ + dbus-daemon \ + dhcp-client \ + dhcp-server \ + e2fsprogs \ + gcc \ + git \ + iproute \ + iputils \ + iscsi-initiator-utils \ + kbd \ + kernel \ + kmod-devel \ + lvm2 \ + make \ + mdadm \ + nfs-utils \ + parted \ + pigz \ + rpm-build \ + squashfs-tools \ + strace \ + sudo \ + tar \ + tcpdump \ + wget \ + which \ + xz \ + && dnf -y update && dnf clean all + +# C10S ships only qemu-kvm, but it disables the KVM accel when it's not +# available +RUN ln -sv /usr/libexec/qemu-kvm /usr/bin/qemu-kvm && \ + ln -sv /usr/libexec/qemu-kvm /usr/bin/qemu-system-$(uname -m) + +# Set default command +CMD ["/usr/bin/bash"] + diff --git a/test/container/Dockerfile-Debian b/test/container/Dockerfile-Debian deleted file mode 100644 index 7e7e6d443..000000000 --- a/test/container/Dockerfile-Debian +++ /dev/null @@ -1,66 +0,0 @@ -FROM docker.io/debian:latest - -# Install needed packages for the dracut CI container -# Install dracut as a linux-initramfs-tool provider so that the default initramfs-tool package does not get installed -# Uninstall initramfs-tools-core as a workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994492 -RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --no-install-recommends dracut && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \ - asciidoc \ - astyle \ - bluez \ - btrfs-progs \ - busybox-static \ - bzip2 \ - ca-certificates \ - cargo \ - console-setup \ - cpio \ - cryptsetup \ - curl \ - dmraid \ - docbook \ - docbook-xml \ - docbook-xsl \ - fdisk \ - g++ \ - gawk \ - git \ - iputils-arping \ - iputils-ping \ - isc-dhcp-client \ - isc-dhcp-server \ - iscsiuio \ - kmod \ - less \ - libdmraid-dev \ - libkmod-dev \ - linux-image-generic \ - lvm2 \ - make \ - mdadm \ - multipath-tools \ - nbd-client \ - nbd-server \ - network-manager \ - nfs-kernel-server \ - ntfs-3g \ - open-iscsi \ - ovmf \ - parted \ - pigz \ - pkg-config \ - procps \ - qemu-kvm \ - rng-tools5 \ - shellcheck \ - sbsigntool \ - squashfs-tools \ - strace \ - systemd-boot-efi \ - tcpdump \ - tgt \ - thin-provisioning-tools \ - tpm2-tools \ - vim \ - wget \ - && apt-get clean && dpkg -P --force-depends dracut dracut-core initramfs-tools-core diff --git a/test/container/Dockerfile-Fedora-latest b/test/container/Dockerfile-Fedora-latest deleted file mode 100644 index 106af17a6..000000000 --- a/test/container/Dockerfile-Fedora-latest +++ /dev/null @@ -1,71 +0,0 @@ -FROM registry.fedoraproject.org/fedora:latest - -# Install needed packages for the dracut CI container -RUN dnf -y install --setopt=install_weak_deps=False \ - asciidoc \ - astyle \ - bash-completion \ - bluez \ - btrfs-progs \ - busybox \ - bzip2 \ - cargo \ - cifs-utils \ - cryptsetup \ - dash \ - dbus-daemon \ - device-mapper-multipath \ - dhcp-client \ - dhcp-server \ - dmraid \ - e2fsprogs \ - f2fs-tools \ - fcoe-utils \ - fuse3 \ - gcc \ - git \ - iproute \ - iputils \ - iscsi-initiator-utils \ - jq \ - kbd \ - kernel \ - kmod-devel \ - libkcapi-hmaccalc \ - libselinux-utils \ - lvm2 \ - lzop \ - make \ - mdadm \ - memstrack \ - mksh \ - nbd \ - ndctl \ - NetworkManager \ - nfs-utils \ - ntfs-3g \ - ntfsprogs \ - nvme-cli \ - parted \ - pcsc-lite \ - pigz \ - qemu \ - qrencode \ - rng-tools \ - rpm-build \ - sbsigntools \ - scsi-target-utils \ - ShellCheck \ - shfmt \ - squashfs-tools \ - strace \ - systemd-boot-unsigned \ - systemd-networkd \ - systemd-resolved \ - systemd-ukify \ - tar \ - tcpdump \ - tpm2-tools \ - wget \ - xz \ - && dnf -y remove dracut --noautoremove && dnf -y update && dnf clean all diff --git a/test/container/Dockerfile-Gentoo b/test/container/Dockerfile-Gentoo deleted file mode 100644 index 7b4eb2a3f..000000000 --- a/test/container/Dockerfile-Gentoo +++ /dev/null @@ -1,59 +0,0 @@ -FROM docker.io/gentoo/portage:latest as portage - -FROM docker.io/gentoo/stage3:systemd -COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo - -# Speed-up using binpkgs -RUN echo "MAKEOPTS=\"-j$(nproc) -l$(nproc)\"" >> /etc/portage/make.conf -RUN echo "EMERGE_DEFAULT_OPTS=\"-j$(nproc) -l$(nproc)\"" >> /etc/portage/make.conf -RUN echo "FEATURES=\"getbinpkg binpkg-ignore-signature parallel-fetch parallel-install pkgdir-index-trusted\"" >> /etc/portage/make.conf - -# systemd-boot, no need to install intramfs with kernel -RUN echo "USE=\"boot kernel-install -initramfs\"" >> /etc/portage/make.conf - -# Use debian's installkernel -RUN echo 'sys-kernel/installkernel -systemd' >> /etc/portage/package.use/kernel - -# Enable ukify and cryptsetup tools (includes unit generator for crypttab) -RUN echo 'sys-apps/systemd ukify cryptsetup' >> /etc/portage/package.use/systemd - -# Support thin volumes and build all of LVM2 including daemons and tools like lvchange -RUN echo 'sys-fs/lvm2 thin lvm' >> /etc/portage/package.use/lvm2 - -RUN emerge --quiet --deep --autounmask-continue=y --with-bdeps=n \ - app-admin/rsyslog \ - app-arch/cpio \ - app-crypt/tpm2-tools \ - app-crypt/sbsigntools \ - app-emulation/qemu \ - app-misc/jq \ - app-portage/gentoolkit \ - app-shells/dash \ - dev-lang/rust-bin \ - net-fs/cifs-utils \ - net-fs/nfs-utils \ - net-misc/dhcp \ - net-wireless/bluez \ - sys-apps/biosdevname \ - sys-apps/busybox \ - sys-apps/nvme-cli \ - sys-apps/rng-tools \ - sys-apps/systemd \ - sys-block/nbd \ - sys-block/open-iscsi \ - sys-block/parted \ - sys-block/tgt \ - sys-fs/btrfs-progs \ - sys-fs/cryptsetup \ - sys-fs/dmraid \ - sys-fs/mdadm \ - sys-fs/multipath-tools \ - sys-fs/ntfs3g \ - sys-fs/squashfs-tools \ - sys-kernel/gentoo-kernel-bin \ - sys-libs/libxcrypt \ - sys-libs/glibc \ - virtual/pkgconfig \ - && rm -rf /var/cache/* /usr/share/doc/* /usr/share/man/* - -RUN emerge --depclean --with-bdeps=n diff --git a/test/container/Dockerfile-OpenSuse-latest b/test/container/Dockerfile-OpenSuse-latest deleted file mode 100644 index a5fb7de5c..000000000 --- a/test/container/Dockerfile-OpenSuse-latest +++ /dev/null @@ -1,52 +0,0 @@ -FROM registry.opensuse.org/opensuse/tumbleweed-dnf:latest - -# Install needed packages for the dracut CI container -RUN dnf -y install --setopt=install_weak_deps=False \ - asciidoc \ - bash-completion \ - btrfsprogs \ - bzip2 \ - cargo \ - cryptsetup \ - dash \ - dbus-broker \ - dhcp-client \ - dhcp-server \ - dmraid \ - e2fsprogs \ - gcc \ - git \ - iproute \ - iputils \ - iscsiuio \ - kbd \ - kernel \ - libkmod-devel \ - lvm2 \ - make \ - mdadm \ - nbd \ - NetworkManager \ - nfs-utils \ - open-iscsi \ - parted \ - pigz \ - procps \ - qemu-kvm \ - rng-tools \ - rpm-build \ - sbsigntools \ - ShellCheck \ - shfmt \ - squashfs \ - strace \ - systemd-boot \ - tar \ - tcpdump \ - tgt \ - tpm2.0-tools \ - /usr/bin/qemu-system-$(uname -m) \ - util-linux-systemd \ - wget \ - xz \ - && rpm -e --nodeps dracut && dnf -y update && dnf clean all diff --git a/test/container/Dockerfile-Ubuntu b/test/container/Dockerfile-Ubuntu deleted file mode 100644 index ef15a67fb..000000000 --- a/test/container/Dockerfile-Ubuntu +++ /dev/null @@ -1,67 +0,0 @@ -FROM docker.io/ubuntu:latest - -# Install needed packages for the dracut CI container -# The Linux kernel is only readable by root. See https://launchpad.net/bugs/759725 -RUN apt-get update -y -qq && apt-get upgrade -y -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \ - asciidoc \ - astyle \ - bluez \ - btrfs-progs \ - busybox-static \ - bzip2 \ - ca-certificates \ - cargo \ - console-setup \ - cpio \ - cryptsetup \ - curl \ - dmraid \ - docbook \ - docbook-xml \ - docbook-xsl \ - fdisk \ - g++ \ - gawk \ - git \ - iputils-arping \ - iputils-ping \ - isc-dhcp-client \ - isc-dhcp-server \ - iscsiuio \ - kmod \ - less \ - libdmraid-dev \ - libkmod-dev \ - linux-image-generic \ - lvm2 \ - make \ - mdadm \ - multipath-tools \ - nbd-client \ - nbd-server \ - network-manager \ - nfs-kernel-server \ - ntfs-3g \ - open-iscsi \ - ovmf \ - parted \ - pigz \ - pkg-config \ - procps \ - qemu-kvm \ - rng-tools5 \ - sbsigntool \ - shellcheck \ - squashfs-tools \ - strace \ - systemd-boot-efi \ - systemd-ukify \ - tcpdump \ - tgt \ - thin-provisioning-tools \ - tpm2-tools \ - vim \ - wget \ - && apt-get clean \ - && chmod a+r /boot/vmlinu* diff --git a/test/container/Dockerfile-Void b/test/container/Dockerfile-Void deleted file mode 100644 index 99044c31b..000000000 --- a/test/container/Dockerfile-Void +++ /dev/null @@ -1,64 +0,0 @@ -FROM ghcr.io/void-linux/void-glibc-full - -RUN xbps-install -Syu xbps && xbps-install -yu \ - asciidoc \ - astyle \ - base-devel \ - bash \ - binutils \ - bluez \ - btrfs-progs \ - busybox \ - cargo \ - cifs-utils \ - connman \ - cpio \ - cryptsetup \ - curl \ - dash \ - dhclient \ - dhcp \ - dmraid \ - dosfstools \ - e2fsprogs \ - edk2-ovmf \ - elfutils \ - eudev \ - f2fs-tools \ - git \ - glibc \ - gnupg \ - iputils \ - jq \ - kbd \ - libkmod-devel \ - linux \ - lvm2 \ - lzop \ - make \ - mdadm \ - mtools \ - nbd \ - NetworkManager \ - nfs-utils \ - ntfs-3g \ - nvme-cli \ - open-iscsi \ - openssh \ - parted \ - pigz \ - plymouth \ - qemu \ - rng-tools \ - sbsigntool \ - shellcheck \ - shfmt \ - squashfs-tools \ - strace \ - systemd-boot-efistub \ - tcpdump \ - tgt \ - tpm2-tools \ - ukify \ - xz \ - && rm -rf /var/cache/xbps diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine deleted file mode 100644 index 4f28c95ee..000000000 --- a/test/container/Dockerfile-alpine +++ /dev/null @@ -1,62 +0,0 @@ -FROM docker.io/alpine:latest - -RUN apk add --no-cache \ - alpine-sdk \ - asciidoc \ - bash \ - binutils \ - blkid \ - btrfs-progs \ - busybox \ - bzip2 \ - cargo \ - coreutils \ - cpio \ - cryptsetup \ - curl \ - dash \ - dhclient \ - dmraid \ - dosfstools \ - e2fsprogs \ - eudev \ - findmnt \ - gawk \ - git \ - gpg \ - grep \ - iputils \ - kbd \ - kmod-dev \ - linux-virt \ - losetup \ - lvm2 \ - make \ - mdadm \ - mtools \ - multipath-tools \ - musl-fts-dev \ - nbd \ - ntfs-3g-progs \ - open-iscsi \ - openssh \ - parted \ - partx \ - pigz \ - procps \ - qemu-img \ - qemu-system-x86_64 \ - rng-tools \ - sed \ - sfdisk \ - squashfs-tools \ - sudo \ - util-linux-misc \ - xz - -RUN \ - cp /usr/lib/udev/rules.d/* /lib/udev/rules.d/ && \ - ln -sf /sbin/poweroff /sbin/shutdown && \ - ln -sf /usr/bin/dash /bin/dash && \ - ln -sf /bin/sh /usr/bin/sh && \ - ln -sf /boot/vmlinuz-virt /boot/vmlinuz-$(cd /lib/modules; ls -1 | tail -1)