You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
89 lines
3.8 KiB
89 lines
3.8 KiB
2 years ago
|
From d19ca83f909ed695f199aa688406f62e3eecadcd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
||
|
|
Date: Tue, 9 Nov 2021 16:01:51 +0100
|
||
|
|
Subject: [PATCH] ci: bump C8 jobs to C9S
|
||
|
|
|
||
|
|
rhel-only
|
||
|
|
---
|
||
|
|
.github/workflows/container.yml | 2 +-
|
||
|
|
.github/workflows/integration.yml | 4 ++--
|
||
|
|
...ockerfile-CentOS-8-Stream => Dockerfile-CentOS-9-Stream} | 13 ++-----------
|
||
|
|
3 files changed, 5 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
|
||
|
|
index a8b3f9b8..adcec4f6 100644
|
||
|
|
--- a/.github/workflows/container.yml
|
||
|
|
+++ b/.github/workflows/container.yml
|
||
|
|
@@ -33,7 +33,7 @@ jobs:
|
||
|
|
- { dockerfile: 'Dockerfile-Fedora-rawhide', tag: 'fedora:rawhide' }
|
||
|
|
- { dockerfile: 'Dockerfile-OpenSuse-latest', tag: 'opensuse:latest' }
|
||
|
|
- { dockerfile: 'Dockerfile-Arch', tag: 'arch:latest' }
|
||
|
|
- - { dockerfile: 'Dockerfile-CentOS-8-Stream', tag: 'centos:stream8' }
|
||
|
|
+ - { dockerfile: 'Dockerfile-CentOS-9-Stream', tag: 'centos:stream9' }
|
||
|
|
steps:
|
||
|
|
- name: Check out the repo
|
||
|
|
uses: actions/checkout@v2
|
||
|
|
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
|
||
|
|
index 9ea718f1..990dd079 100644
|
||
|
|
--- a/.github/workflows/integration.yml
|
||
|
|
+++ b/.github/workflows/integration.yml
|
||
|
|
@@ -79,7 +79,7 @@ jobs:
|
||
|
|
|
||
|
|
- name: "${{ matrix.container }} TEST-${{ matrix.test }}"
|
||
|
|
run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
|
||
|
|
- centos-8-stream:
|
||
|
|
+ centos-9-stream:
|
||
|
|
runs-on: ubuntu-latest
|
||
|
|
timeout-minutes: 45
|
||
|
|
concurrency:
|
||
|
|
@@ -88,7 +88,7 @@ jobs:
|
||
|
|
strategy:
|
||
|
|
matrix:
|
||
|
|
container: [
|
||
|
|
- "centos:stream8",
|
||
|
|
+ "centos:stream9",
|
||
|
|
]
|
||
|
|
# Disabled tests (due to dropped packages in RHEL/CentOS):
|
||
|
|
# 03, 04, 15: requires btrfs
|
||
|
|
diff --git a/test/container/Dockerfile-CentOS-8-Stream b/test/container/Dockerfile-CentOS-9-Stream
|
||
|
|
similarity index 65%
|
||
|
|
rename from test/container/Dockerfile-CentOS-8-Stream
|
||
|
|
rename to test/container/Dockerfile-CentOS-9-Stream
|
||
|
|
index b14cc64a..da94f134 100644
|
||
|
|
--- a/test/container/Dockerfile-CentOS-8-Stream
|
||
|
|
+++ b/test/container/Dockerfile-CentOS-9-Stream
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-FROM quay.io/centos/centos:stream8
|
||
|
|
+FROM quay.io/centos/centos:stream9
|
||
|
|
|
||
|
|
MAINTAINER https://github.com/dracutdevs/dracut
|
||
|
|
|
||
|
|
@@ -7,17 +7,8 @@ LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=h
|
||
|
|
|
||
|
|
RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh
|
||
|
|
|
||
|
|
-# FIXME: the mirrors were desynchronized at the time of writing, leading to several
|
||
|
|
-# conflicts when installing dependencies below
|
||
|
|
-RUN sed -i -e 's/^mirrorlist=/#mirrorlist=/g' -e 's/^#baseurl=/baseurl=/g' /etc/yum.repos.d/*.repo
|
||
|
|
-
|
||
|
|
# Install needed packages for the dracut CI container
|
||
|
|
RUN dnf -y install epel-release && \
|
||
|
|
- `# FIXME: this is required to work around a bug in e2fsprogs, remove when CentOS 8.5 is out` && \
|
||
|
|
- dnf -y install dnf-plugins-core && \
|
||
|
|
- dnf -y copr enable mrc0mmand/systemd-centos-ci-centos8 && \
|
||
|
|
- dnf -y install e2fsprogs && \
|
||
|
|
- `# End of FIXME` && \
|
||
|
|
dnf -y install --enablerepo powertools --enablerepo epel --setopt=install_weak_deps=False \
|
||
|
|
qemu-kvm \
|
||
|
|
NetworkManager \
|
||
|
|
@@ -54,7 +45,7 @@ RUN dnf -y install epel-release && \
|
||
|
|
xz \
|
||
|
|
&& dnf -y update && dnf clean all
|
||
|
|
|
||
|
|
-# CentOS 8 ships only qemu-kvm, but it disables the KVM accel when it's not
|
||
|
|
+# C9S 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)
|
||
|
|
|