ci: fix packit & .github/* configuration

+ add C10s dockerfile.
redhat-plumbers · Jul 22, 2024 · 7ae6c1c · 7ae6c1c
1 parent e02ef9a
commit 7ae6c1c
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 523 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -18,17 +18,17 @@ permissions:
     contents: read
 
 jobs:
-    arm64:
+    push_to_registry:
         name: ${{ matrix.config.tag }} on ${{ matrix.config.platform }}
         runs-on: ubuntu-latest
         concurrency:
-            group: arm64-${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
+            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
             cancel-in-progress: true
         strategy:
             fail-fast: false
             matrix:
                 config:
-                    - { dockerfile: 'Dockerfile-Fedora-latest',     tag: 'fedora',     platform: 'linux/arm64,linux/amd64' }
+                    - { dockerfile: 'Dockerfile-CentOS-10-Stream',   tag: 'centos:stream10' }
         steps:
             -   name: Set up QEMU
                 uses: docker/setup-qemu-action@v3
@@ -50,6 +50,6 @@ jobs:
                 uses: docker/build-push-action@v5
                 with:
                     file: test/container/${{ matrix.config.dockerfile }}
-                    tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.config.tag }}:latest
+                    tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.config.tag }}
                     push: ${{ github.event_name == 'push' ||  github.event_name == 'schedule' }}
                     platforms: ${{ matrix.config.platform }}
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -18,14 +18,14 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 test: [
                         "01",
                 ]
             fail-fast: false
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/redhat-plumbers/${{ matrix.container }}
             options: "--privileged -v /dev:/dev"
         steps:
             -   name: "Checkout Repository"
@@ -42,7 +42,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 network: [
                         "network",
@@ -55,7 +55,7 @@ jobs:
                 ]
             fail-fast: false
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/redhat-plumbers/${{ matrix.container }}
             options: "--privileged -v /dev:/dev"
         steps:
             -   name: "Checkout Repository"
@@ -72,7 +72,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "opensuse",
+                        "centos:stream10",
                 ]
                 network: [
                         "network-legacy",
@@ -84,7 +84,7 @@ jobs:
                 ]
             fail-fast: false
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/redhat-plumbers/${{ matrix.container }}
             options: "--privileged -v /dev:/dev"
         steps:
             -   name: "Checkout Repository"
@@ -112,7 +112,7 @@ jobs:
                 ]
             fail-fast: false
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/redhat-plumbers/${{ matrix.container }}
             options: "--privileged -v /dev:/dev"
         steps:
             -   name: "Checkout Repository"
@@ -129,7 +129,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 test: [
                         "02",
@@ -168,7 +168,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 network: [
                         "network-manager",
@@ -205,7 +205,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 test: [
                         "98",
@@ -219,4 +219,4 @@ jobs:
             -   name: "Checkout Repository"
                 uses: actions/checkout@v4
             -   name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-                run: docker run --platform linux/arm64 --privileged -v /dev:/dev -v $PWD:/w ghcr.io/dracut-ng/${{ matrix.container }} /w/tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+                run: docker run --platform linux/arm64 --privileged -v /dev:/dev -v $PWD:/w ghcr.io/redhat-plumbers/${{ matrix.container }} /w/tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
diff --git a/.github/workflows/manualtest.yml b/.github/workflows/manualtest.yml
@@ -9,9 +9,9 @@ on:
             container:
                 type: choice
                 description: 'distro'
-                default: 'fedora'
+                default: 'centos:stream10'
                 options:
-                    - "fedora"
+                    - "centos:stream10"
             env:
                 description: 'Environment (optional)'
                 default: '{"DEBUGFAIL": "rd.debug"}'

diff --git 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
diff --git a/test/container/Dockerfile-CentOS-10-Stream b/test/container/Dockerfile-CentOS-10-Stream
@@ -0,0 +1,123 @@
+FROM quay.io/centos/centos:stream10-development
+
+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 --skip-broken --enablerepo crb --setopt=install_weak_deps=False \
+    qemu-kvm \
+    NetworkManager \
+    asciidoc \
+    bash-completion \
+    bzip2 \
+    cryptsetup \
+    dbus-daemon \
+    dhcp \
+    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)
+
+# From Fedora container
+# Install needed packages for the dracut CI container
+RUN dnf -y install --skip-broken --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 \
+    erofs-utils \
+    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