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 a4c3ae73725133de9071483e16a21cd6673aae58..03c9c5ec273ef4a86ca2a69f94b7d1c8caa95b45 100644 (file)
--- 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 336d63a1886c39762896b74e6cbd5e812164c617..6199b5144fef69776a8f21b1e6cc35297805f567 100644 (file)
--- 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 (file)
index b9701f6..0000000
--- 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 (file)
index 0291a79..0000000
--- 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 (file)
index 2d5653a..0000000
--- 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"]