Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
scaronni authored and amilonenv committed Oct 21, 2024
1 parent 8fa99b3 commit 848e874
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@ jobs:
- {name: "centos/centos", tag: "stream9", url: "quay.io/"}
- {name: "debian", tag: "testing"}
- {name: "debian", tag: "12"}
- {name: "debian", tag: "11"}
- {name: "fedora/fedora", tag: "rawhide", url: "quay.io/"}
- {name: "fedora/fedora", tag: "41", url: "quay.io/"}
- {name: "fedora/fedora", tag: "40", url: "quay.io/"}
- {name: "fedora/fedora", tag: "39", url: "quay.io/"}
- {name: "gentoo/stage3", tag: "latest"}
- {name: "opensuse/tumbleweed", tag: "latest", variant: "-default", url: "registry.opensuse.org/"}
- {name: "opensuse/leap", tag: "15.5", variant: "-default", url: "registry.opensuse.org/"}
- {name: "opensuse/leap", tag: "15.6", variant: "-default", url: "registry.opensuse.org/"}
- {name: "ubuntu", tag: "24.10"}
- {name: "ubuntu", tag: "24.04"}
- {name: "ubuntu", tag: "23.10"}
- {name: "ubuntu", tag: "22.04"}
- {name: "ubuntu", tag: "20.04"}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
container:
image: ${{ matrix.distro.url }}${{ matrix.distro.name }}:${{ matrix.distro.tag }}

Expand Down Expand Up @@ -74,13 +73,6 @@ jobs:
apt-get update -q
apt-get install -qy make linux-headers-amd64 linux-image-amd64 openssl xz-utils
- name: Install Gentoo Linux dependencies
if: matrix.distro.name == 'gentoo/stage3'
run: |
echo -e "ACCEPT_KEYWORDS=\"~amd64\"\nACCEPT_LICENSE=\"*\"" >> /etc/portage/make.conf
emerge --sync
FEATURES="getbinpkg binpkg-ignore-signature" USE="generic-uki" emerge --noreplace -j$(nproc) -l$(nproc) --autounmask-continue '>=sys-kernel/gentoo-kernel-bin-6.6.0'
- name: Install openSUSE leap dependencies
if: contains(matrix.distro.name, 'opensuse')
run: |
Expand Down
2 changes: 0 additions & 2 deletions run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ generalize_expected_output() {
sed -i "/^ERROR (dkms apport): /d" ${output_log}
# Drop empty lines
sed -i "/^$/d" ${output_log}
# Gentoo complains there is not a .comment section in the built modules
sed -i "/^readelf\: Warning: Section '.comment' was not dumped because it does not exist$/d" ${output_log}
# Swap any CC/LD/... flags (if set) with a placeholder message
sed -i "s|\(make -j1 KERNELRELEASE=${KERNEL_VER} all\).*|\1 <omitting possibly set CC/LD/... flags>|" ${output_log}
}
Expand Down

0 comments on commit 848e874

Please sign in to comment.