Skip to content

Commit 45a4a94

Browse files
mcmilkbehlendorf
authored andcommitted
ZTS: Remove functional tests via matrix
This commit changes the workflow of the github actions. - Ubuntu 20.04, 22.04, 24.04 will be tested via QEMU now - remove unused scripts of this commit: b7bc334 - re-add the zloop standalone testings via zloop.yml Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de> Closes openzfs#16549
1 parent 7a965b9 commit 45a4a94

11 files changed

+76
-495
lines changed

.github/workflows/build-dependencies.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/checkstyle-dependencies.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/checkstyle.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ jobs:
1313
ref: ${{ github.event.pull_request.head.sha }}
1414
- name: Install dependencies
1515
run: |
16-
# https://github.com/orgs/community/discussions/47863
17-
sudo apt-mark hold grub-efi-amd64-signed
18-
sudo apt-get update --fix-missing
19-
sudo apt-get upgrade
20-
sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
21-
sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/checkstyle-dependencies.txt apt-get install -qq
22-
sudo python3 -m pip install --quiet flake8
23-
sudo apt-get clean
24-
16+
# for x in lxd core20 snapd; do sudo snap remove $x; done
17+
sudo apt-get purge -y snapd google-chrome-stable firefox
18+
ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps.sh ubuntu22
19+
sudo apt-get install -y cppcheck devscripts mandoc pax-utils shellcheck
20+
sudo python -m pipx install --quiet flake8
2521
# confirm that the tools are installed
2622
# the build system doesn't fail when they are not
2723
checkbashisms --version
@@ -31,8 +27,13 @@ jobs:
3127
shellcheck --version
3228
- name: Prepare
3329
run: |
30+
sed -i '/DEBUG_CFLAGS="-Werror"/s/^/#/' config/zfs-build.m4
3431
./autogen.sh
32+
- name: Configure
33+
run: |
3534
./configure
35+
- name: Make
36+
run: |
3637
make -j$(nproc) --no-print-directory --silent
3738
- name: Checkstyle
3839
run: |

.github/workflows/scripts/generate-summary.sh

Lines changed: 0 additions & 119 deletions
This file was deleted.

.github/workflows/scripts/qemu-3-deps.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ case "$1" in
141141
;;
142142
esac
143143

144+
# This script is used for checkstyle + zloop deps also.
145+
# Install only the needed packages and exit - when used this way.
146+
test -z "${ONLY_DEPS:-}" || exit 0
147+
144148
# Start services
145149
echo "##[group]Enable services"
146150
case "$1" in

.github/workflows/scripts/setup-dependencies.sh

Lines changed: 0 additions & 88 deletions
This file was deleted.

.github/workflows/scripts/setup-functional.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)