@@ -33,21 +33,22 @@ jobs:
3333 - name : Set up local ccache environment
3434 run : |
3535 echo "PATH=/usr/lib64/ccache:/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
36- echo "CCACHE_DIR=/home/runner/_work/ _ccache" >> "$GITHUB_ENV"
36+ echo "CCACHE_DIR=/home/runner/_ccache" >> "$GITHUB_ENV"
3737 - run : ccache -s
3838 - name : Build kernel for virtme
3939 run : |
4040 vng --version
4141 vng --verbose --kconfig --config .github/workflows/kconfig.btrfs --config .github/workflows/kconfig.fstests
42- #make localmodconfig
4342 cat .github/workflows/kconfig.btrfs .github/workflows/kconfig.fstests >> .config
43+ scripts/config -d SOUND -d DRM -d KVM -d SQUASHFS -d PCMCIA -d PCCARD -d CARDBUS
44+ scripts/config -d ATA -d INPUT_MOUSE -d MOUSE_PS2 -d FB -d HDMI -d SND -d BPF
4445 make olddefconfig
45- vng --verbose --build
46+ make -j 8
4647 - run : ccache -s
4748 - name : Test boot of built kernel
4849 run : sudo vng --verbose -o=-enable-kvm -- 'uname -a; echo PATH=$PATH; ulimit -a'
4950
50- build-and- test :
51+ test :
5152 if : github.ref != 'refs/heads/ci-kvm'
5253 needs : setup
5354 # 20h timeout
5657 strategy :
5758 matrix :
5859 mask :
59- - " btrfs/[0-1]* "
60+ - " btrfs/001 "
6061 mount :
6162 - " "
6263 mkfs :
7677 - name : Set up local ccache environment
7778 run : |
7879 echo "PATH=/usr/lib64/ccache:/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
79- echo "CCACHE_DIR=/home/runner/_work/ _ccache" >> "$GITHUB_ENV"
80+ echo "CCACHE_DIR=/home/runner/_ccache" >> "$GITHUB_ENV"
8081 - run : ccache -s
8182 - name : Check KVM and virtme
8283 # Check version and that it can actually run on the host VM
@@ -87,10 +88,11 @@ jobs:
8788 - name : Build kernel for virtme
8889 run : |
8990 vng --verbose --kconfig --config .github/workflows/kconfig.btrfs --config .github/workflows/kconfig.fstests
90- #make localmodconfig
9191 cat .github/workflows/kconfig.btrfs .github/workflows/kconfig.fstests >> .config
92+ scripts/config -d SOUND -d DRM -d KVM -d SQUASHFS -d PCMCIA -d PCCARD -d CARDBUS
93+ scripts/config -d ATA -d INPUT_MOUSE -d MOUSE_PS2 -d FB -d HDMI -d SND -d BPF
9294 make olddefconfig
93- vng --verbose --build
95+ make -j 8
9496 - name : Test boot of built kernel
9597 run : sudo vng -o=-enable-kvm -- uname -a
9698 # Note: post-update could drop permissions from /dev/kvm
@@ -100,7 +102,7 @@ jobs:
100102 gcc git indent libacl1-dev libaio-dev libcap-dev libgdbm-dev libtool \
101103 libtool-bin liburing-dev libuuid1 lvm2 make psmisc python3 quota sed \
102104 uuid-dev uuid-runtime xfsprogs sqlite3 libgdbm-compat-dev \
103- fsverity parted fscrypt \
105+ fsverity parted fscrypt keyutils \
104106 xfsdump xfslibs-dev libbtrfs-dev libbtrfsutil-dev btrfs-progs pkg-config duperemove \
105107 liblzo2-dev libzstd-dev libblkid-dev zlib1g-dev libext2fs-dev libudev-dev
106108 ls -l /dev/kvm
@@ -118,6 +120,7 @@ jobs:
118120 ./configure --disable-documentation --disable-python --enable-experimental
119121 make -j8
120122 sudo make install
123+ sudo cp btrfs-corrupt-block /usr/local/sbin
121124 popd
122125 type -p btrfs
123126 btrfs --version
@@ -158,7 +161,6 @@ jobs:
158161 # Mask accepts excludes, special entries must not exclude themselves
159162 if echo "${{ matrix.mask }}" | grep -q '[]*[]'; then \
160163 echo "btrfs/010" >> EXCLUDE-GH; \
161- echo "generic/562'" >> EXCLUDE-GH; \
162164 fi
163165 popd
164166 # With --rw we have full access to the host
@@ -175,22 +177,12 @@ jobs:
175177 --user root --network user -- \
176178 "cd ${{ github.workspace }}/xfstests; lscpu; free -m; cat /proc/partitions; ulimit -n 65536; ulimit -a; \
177179 cat local.config; \
178- ls -l /usr/local/bin /usr/local/sbin; \
179- echo "PATH=$PATH"; \
180- PATH="/usr/local/bin:/usr/local/sbin:$PATH"; \
181- echo "PATH=$PATH"; \
182- type -p btrfs; \
183- type -P btrfs; \
184- readlink -f /bin/btrfs; \
185- ls -l /bin/*btrfs* ; \
186- ls -l /sbin/*btrfs* ; \
187- ls -l /usr/bin/*btrfs* ; \
188- ls -l /usr/sbin/*btrfs* ; \
189- /bin/bash --version ; \
180+ PATH=\"/usr/local/bin:/usr/local/sbin:$PATH\"; \
181+ echo \"PATH=$PATH\"; \
190182 btrfs --version ; \
191183 mkfs.btrfs /dev/vda ; \
192- env --default-signal=PIPE GITHUB_ACTIONS=$GITHUB_ACTIONS \
193- ./check -R xunit -b -T -E EXCLUDE-GH ${{ matrix.mask }} ; \
184+ env --default-signal=PIPE GITHUB_ACTIONS=\" $GITHUB_ACTIONS\" \
185+ ./check -R xunit -b -T -E EXCLUDE-GH btrfs/001 btrfs/075 ; \
194186 echo FSTESTS FINISHED"
195187 - name : Clean up VM environment
196188 if : always()
@@ -206,7 +198,7 @@ jobs:
206198 if : success() || failure()
207199 with :
208200 annotate_only : true
209- report_paths : ' ${{ github.workspace }}/xfstests/results/result.xml'
201+ report_paths : ' ${{ github.workspace }}/xfstests/results/result.xml* '
210202 - name : Sanitize mask before publishing results
211203 if : success() || failure()
212204 run : |
0 commit comments