Skip to content

Commit

Permalink
Add a TAG Client/Server system for ZTS
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmilk committed Oct 1, 2024
1 parent b1958b5 commit 1f20e6e
Show file tree
Hide file tree
Showing 8 changed files with 216 additions and 245 deletions.
64 changes: 0 additions & 64 deletions .github/workflows/checkstyle.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/codeql.yml

This file was deleted.

11 changes: 7 additions & 4 deletions .github/workflows/scripts/qemu-3-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function archlinux() {
sudo pacman -Sy --noconfirm base-devel bc cpio dhclient dkms fakeroot \
fio gdb inetutils jq less linux linux-headers lsscsi nfs-utils parted \
pax perf python-packaging python-setuptools qemu-guest-agent ksh samba \
sysstat rng-tools rsync wget xxhash
socat sysstat rng-tools rsync wget xxhash
echo "##[endgroup]"
}

Expand All @@ -38,7 +38,8 @@ function debian() {
lsscsi nfs-kernel-server pamtester parted python3 python3-all-dev \
python3-cffi python3-dev python3-distlib python3-packaging \
python3-setuptools python3-sphinx qemu-guest-agent rng-tools rpm2cpio \
rsync samba sysstat uuid-dev watchdog wget xfslibs-dev xxhash zlib1g-dev
rsync samba socat sysstat uuid-dev watchdog wget xfslibs-dev xxhash \
zlib1g-dev
echo "##[endgroup]"
}

Expand All @@ -48,7 +49,8 @@ function freebsd() {
echo "##[group]Install Development Tools"
sudo pkg install -y autoconf automake autotools base64 checkbashisms fio \
gdb gettext gettext-runtime git gmake gsed jq ksh93 lcov libtool lscpu \
pkgconf python python3 pamtester pamtester qemu-guest-agent rsync xxhash
pkgconf python python3 pamtester pamtester qemu-guest-agent rsync socat \
xxhash
sudo pkg install -xy \
'^samba4[[:digit:]]+$' \
'^py3[[:digit:]]+-cffi$' \
Expand All @@ -75,7 +77,8 @@ function rhel() {
lsscsi mdadm nfs-utils openssl-devel pam-devel pamtester parted perf \
python3 python3-cffi python3-devel python3-packaging kernel-devel \
python3-setuptools qemu-guest-agent rng-tools rpcgen rpm-build rsync \
samba sysstat systemd watchdog wget xfsprogs-devel xxhash zlib-devel
samba socat sysstat systemd watchdog wget xfsprogs-devel xxhash \
zlib-devel
echo "##[endgroup]"
}

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/scripts/qemu-6-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if [ -z ${1:-} ]; then
| while read -r line; do prefix "$i" "$line"; done &
echo $! > vm${i}log.pid
# don't mix up the initial --- Configuration --- part
sleep 0.13
sleep 0.2
done

# wait for all vm's to finish
Expand Down Expand Up @@ -97,7 +97,13 @@ fi
sudo dmesg -c > dmesg-prerun.txt
mount > mount.txt
df -h > df-prerun.txt
$TDIR/zfs-tests.sh -vK -s 3GB -T $TAGS
# start tag-server on the first vm:
if [ "$2" = "1" ]; then
$TDIR/zfs-tests.sh -vK -s 3GB -T 192.168.122.11:2323/server
sleep 1
fi
# run all tags, provided by tag-server
$TDIR/zfs-tests.sh -vK -s 3GB -T 192.168.122.11:2323/vm$2
RV=$?
df -h > df-postrun.txt
echo $RV > tests-exitcode.txt
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/zfs-qemu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora40", "freebsd13", "freebsd14", "ubuntu24"]'
# determine CI type when running on PR
ci_type="full"
ci_type="quick"
if ${{ github.event_name == 'pull_request' }}; then
head=${{ github.event.pull_request.head.sha }}
base=${{ github.event.pull_request.base.sha }}
Expand Down Expand Up @@ -57,6 +58,19 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Setup SSH
run: |
mkdir -p $HOME/.ssh
echo "ConnectTimeout 4" >> $HOME/.ssh/config
echo "StrictHostKeyChecking no" >> $HOME/.ssh/config
echo "${{ secrets.AUTHORIZED_KEYS }}" >> $HOME/.ssh/authorized_keys
echo "${{ secrets.SSH_KEY }}" > $HOME/.ssh/id_ed25519
echo "${{ secrets.KNOWN_HOSTS }}" >> $HOME/.ssh/known_hosts
chmod 600 $HOME/.ssh/id_ed25519
R=`shuf -n 1 -i 10000-60000`
echo "Port $R"
ssh -x -N -C -f -R $R:127.0.0.1:22 mcmilk@${{ secrets.SOME_HOST }}
- name: Setup QEMU
timeout-minutes: 10
run: .github/workflows/scripts/qemu-1-setup.sh
Expand Down
77 changes: 0 additions & 77 deletions .github/workflows/zloop.yml

This file was deleted.

Loading

0 comments on commit 1f20e6e

Please sign in to comment.