From: Laszlo Gombos Date: Fri, 6 May 2022 11:55:10 +0000 (+0000) Subject: ci(integration): maintain only Fedora latest X-Git-Tag: 057~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b339d7351ab999deb00263996e04806ea079708;p=thirdparty%2Fdracut.git ci(integration): maintain only Fedora latest Alphabetically ordering the distributions in the container section --- diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index a4c3ae737..03c9c5ec2 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -29,7 +29,6 @@ jobs: matrix: config: - { dockerfile: 'Dockerfile-Fedora-latest', tag: 'fedora:latest' } - - { dockerfile: 'Dockerfile-Fedora-rawhide', tag: 'fedora:rawhide' } - { dockerfile: 'Dockerfile-OpenSuse-latest', tag: 'opensuse:latest' } - { dockerfile: 'Dockerfile-Arch', tag: 'arch:latest' } - { dockerfile: 'Dockerfile-Debian', tag: 'debian:latest' } diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 336d63a18..6199b5144 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -14,11 +14,10 @@ jobs: strategy: matrix: container: [ - "fedora:33", - "fedora:rawhide", - "opensuse:latest", "arch:latest", "debian:latest", + "fedora:latest", + "opensuse:latest", ] test: [ "04", @@ -50,7 +49,6 @@ jobs: "01", "02", "03", - "04", "10", "11", "12", diff --git a/test/container/Dockerfile-Fedora-34 b/test/container/Dockerfile-Fedora-34 deleted file mode 100644 index b9701f6d5..000000000 --- a/test/container/Dockerfile-Fedora-34 +++ /dev/null @@ -1,55 +0,0 @@ -FROM registry.fedoraproject.org/fedora:34 - -MAINTAINER https://github.com/dracutdevs/dracut - -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 -RUN dnf -y install --setopt=install_weak_deps=False \ - dash \ - pigz \ - asciidoc \ - mdadm \ - lvm2 \ - dmraid \ - cryptsetup \ - nfs-utils \ - nbd \ - dhcp-server \ - scsi-target-utils \ - iscsi-initiator-utils \ - strace \ - btrfs-progs \ - kmod-devel \ - gcc \ - bzip2 \ - xz \ - tar \ - wget \ - rpm-build \ - make \ - git \ - bash-completion \ - sudo \ - kernel \ - dhcp-client \ - /usr/bin/qemu-kvm \ - /usr/bin/qemu-system-$(uname -i) \ - e2fsprogs \ - tcpdump \ - iproute \ - iputils \ - dbus-daemon \ - kbd \ - NetworkManager \ - python3-imgcreate \ - which \ - ShellCheck \ - shfmt \ - && dnf -y update && dnf clean all - -# Set default command -CMD ["/usr/bin/bash"] diff --git a/test/container/Dockerfile-Fedora-35 b/test/container/Dockerfile-Fedora-35 deleted file mode 100644 index 0291a798e..000000000 --- a/test/container/Dockerfile-Fedora-35 +++ /dev/null @@ -1,55 +0,0 @@ -FROM registry.fedoraproject.org/fedora:35 - -MAINTAINER https://github.com/dracutdevs/dracut - -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 -RUN dnf -y install --setopt=install_weak_deps=False \ - dash \ - pigz \ - asciidoc \ - mdadm \ - lvm2 \ - dmraid \ - cryptsetup \ - nfs-utils \ - nbd \ - dhcp-server \ - scsi-target-utils \ - iscsi-initiator-utils \ - strace \ - btrfs-progs \ - kmod-devel \ - gcc \ - bzip2 \ - xz \ - tar \ - wget \ - rpm-build \ - make \ - git \ - bash-completion \ - sudo \ - kernel \ - dhcp-client \ - /usr/bin/qemu-kvm \ - /usr/bin/qemu-system-$(uname -i) \ - e2fsprogs \ - tcpdump \ - iproute \ - iputils \ - dbus-daemon \ - kbd \ - NetworkManager \ - python3-imgcreate \ - which \ - ShellCheck \ - shfmt \ - && dnf -y update && dnf clean all - -# Set default command -CMD ["/usr/bin/bash"] diff --git a/test/container/Dockerfile-Fedora-rawhide b/test/container/Dockerfile-Fedora-rawhide deleted file mode 100644 index 2d5653a7a..000000000 --- a/test/container/Dockerfile-Fedora-rawhide +++ /dev/null @@ -1,55 +0,0 @@ -FROM registry.fedoraproject.org/fedora:rawhide - -MAINTAINER https://github.com/dracutdevs/dracut - -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 -RUN dnf -y install --setopt=install_weak_deps=False \ - dash \ - pigz \ - asciidoc \ - mdadm \ - lvm2 \ - dmraid \ - cryptsetup \ - nfs-utils \ - nbd \ - dhcp-server \ - scsi-target-utils \ - iscsi-initiator-utils \ - strace \ - btrfs-progs \ - kmod-devel \ - gcc \ - bzip2 \ - xz \ - tar \ - wget \ - rpm-build \ - make \ - git \ - bash-completion \ - sudo \ - kernel \ - dhcp-client \ - /usr/bin/qemu-kvm \ - /usr/bin/qemu-system-$(uname -i) \ - e2fsprogs \ - tcpdump \ - iproute \ - iputils \ - dbus-daemon \ - kbd \ - NetworkManager \ - python3-imgcreate \ - which \ - ShellCheck \ - shfmt \ - && dnf -y update && dnf clean all - -# Set default command -CMD ["/usr/bin/bash"]