Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZTS: add Ubuntu 20.04, 22.04 and 24.04 to the QEMU tests #16549

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions .github/workflows/build-dependencies.txt

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/checkstyle-dependencies.txt

This file was deleted.

19 changes: 10 additions & 9 deletions .github/workflows/checkstyle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
- name: Install dependencies
run: |
# https://github.com/orgs/community/discussions/47863
sudo apt-mark hold grub-efi-amd64-signed
sudo apt-get update --fix-missing
sudo apt-get upgrade
sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/checkstyle-dependencies.txt apt-get install -qq
sudo python3 -m pip install --quiet flake8
sudo apt-get clean
# for x in lxd core20 snapd; do sudo snap remove $x; done
sudo apt-get purge -y snapd google-chrome-stable firefox
ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps.sh ubuntu22
sudo apt-get install -y cppcheck devscripts mandoc pax-utils shellcheck
sudo python -m pipx install --quiet flake8
# confirm that the tools are installed
# the build system doesn't fail when they are not
checkbashisms --version
Expand All @@ -31,8 +27,13 @@ jobs:
shellcheck --version
- name: Prepare
run: |
sed -i '/DEBUG_CFLAGS="-Werror"/s/^/#/' config/zfs-build.m4
./autogen.sh
- name: Configure
run: |
./configure
- name: Make
run: |
make -j$(nproc) --no-print-directory --silent
- name: Checkstyle
run: |
Expand Down
119 changes: 0 additions & 119 deletions .github/workflows/scripts/generate-summary.sh

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/scripts/qemu-3-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ case "$1" in
;;
esac

# This script is used for checkstyle + zloop deps also.
# Install only the needed packages and exit - when used this way.
test -z "${ONLY_DEPS:-}" || exit 0

# Start services
echo "##[group]Enable services"
case "$1" in
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/scripts/qemu-7-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ for i in $(seq 1 $VMs); do
test -s $file && mv -f $file uname.txt

file="vm$i/tests-exitcode.txt"
test -s $file || echo 1 > $file
if [ ! -s $file ]; then
# XXX - add some tests for kernel panic's here
# tail -n 80 vm$i/console.txt | grep XYZ
echo 1 > $file
fi
rv=$(cat vm$i/tests-exitcode.txt)
test $rv != 0 && touch /tmp/have_failed_tests

Expand Down Expand Up @@ -89,7 +93,6 @@ fi
cat summary.txt \
| awk '/\(expected PASS\)/{ if ($1!="SKIP") print $2; next; } show' \
| while read t; do
echo "check: $t"
cat summary-failure-logs.txt \
| awk '$0~/Test[: ]/{ show=0; } $0~v{ show=1; } show' v="$t" \
> /tmp/fail.txt
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/scripts/qemu-8-summary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ EOF
cat /tmp/summary.txt
echo ""

if [ -e /tmp/have_failed_tests ]; then
RV=1
if [ -f /tmp/have_failed_tests -a -s /tmp/failed.txt ]; then
echo "Debuginfo of failed tests:"
cat /tmp/failed.txt
echo ""
cat /tmp/summary.txt | grep -v '^/'
echo ""
else
RV=0
fi

echo -e "\nFull logs for download:\n $1\n"
Expand All @@ -70,4 +67,5 @@ for i in $(seq 1 $VMs); do
test -s "$file" && showfile "$file" "$vm: failure logfile"
done

exit $RV
test -f /tmp/have_failed_tests && exit 1
exit 0
88 changes: 0 additions & 88 deletions .github/workflows/scripts/setup-dependencies.sh

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/scripts/setup-functional.sh

This file was deleted.

Loading
Loading