Skip to content
Open
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
7 changes: 4 additions & 3 deletions .github/workflows/checkstyle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ jobs:
- name: Prepare artifacts
if: failure() && steps.CheckABI.outcome == 'failure'
run: |
find -name *.abi | tar -cf abi_files.tar -T -
- uses: actions/upload-artifact@v4
find -name *.abi | tar -cjf abi_files.tar.bz2 -T -
- uses: actions/upload-artifact@v7
if: failure() && steps.CheckABI.outcome == 'failure'
with:
name: New ABI files (use only if you're sure about interface changes)
path: abi_files.tar
path: abi_files.tar.bz2
archive: false
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV

- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
22 changes: 20 additions & 2 deletions .github/workflows/scripts/qemu-7-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,29 @@ source env.txt

mkdir -p $RESPATH

TARNAME=qemu-$OS

# check if building the module has failed
if [ -z ${VMs:-} ]; then
cd $RESPATH
echo ":exclamation: ZFS module didn't build successfully :exclamation:" \
| tee summary.txt | tee /tmp/summary.txt
cp /var/tmp/*.txt .
tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true

# rename /var/tmp/test_results to /var/tmp/qemu-$OS
mv $RESPATH $(dirname $RESPATH)/$TARNAME
tar cjf /tmp/$TARNAME.tar.bz2 -C $(dirname $RESPATH) -h $TARNAME || true
# move it back to /var/tmp/test_results (needed for next script)
mv $(dirname $RESPATH)/$TARNAME $RESPATH

exit 0
fi

if ! grep -q vm /etc/hosts ; then
echo "No vm* hostnames, VMs probably didn't startup"
exit 0
fi

# build was okay
BASE="$HOME/work/zfs/zfs"
MERGE="$BASE/.github/workflows/scripts/merge_summary.awk"
Expand Down Expand Up @@ -121,4 +134,9 @@ if [ ! -s uname.txt ]; then
fi

# artifact ready now
tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true
#
# rename /var/tmp/test_results to /var/tmp/qemu-$OS
mv $RESPATH $(dirname $RESPATH)/$TARNAME
tar cjf /tmp/$TARNAME.tar.bz2 -C $(dirname $RESPATH) -h $TARNAME || true
# move it back to /var/tmp/test_results (needed for next script)
mv $(dirname $RESPATH)/$TARNAME $RESPATH
4 changes: 3 additions & 1 deletion .github/workflows/scripts/qemu-9-summary-page.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ function send2github() {
# first call, generate all summaries
if [ ! -f out-1.md ]; then
logfile="1"
for tarfile in Logs-functional-*/qemu-*.tar; do
# The bz2 files are put into directories with the same name, like:
# "qemu-debian12.tar.bz2/qemu-debian12.tar.bz2"
for tarfile in qemu-*.tar.bz2/qemu-*.tar.bz2; do
rm -rf vm* *.txt
if [ ! -s "$tarfile" ]; then
output "\n## Functional Tests: unknown\n"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout smatch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: error27/smatch
ref: master
Expand All @@ -26,7 +26,7 @@ jobs:
cd $GITHUB_WORKSPACE/smatch
make -j$(nproc)
- name: Checkout OpenZFS
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
path: zfs
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/zfs-qemu-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora42', 'fedora43']
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand All @@ -73,7 +73,7 @@ jobs:

- name: Install dependencies
run: |
.github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }}
.github/workflows/scripts/qemu-3-deps.sh --poweroff ${{ matrix.os }}

- name: Build modules or Test repo
run: |
Expand Down Expand Up @@ -104,34 +104,35 @@ jobs:
run: |
rsync -a zfs@vm0:/tmp/repo /tmp || true
.github/workflows/scripts/replace-dupes-with-symlinks.sh /tmp/repo
tar -cf ${{ matrix.os }}-repo.tar -C /tmp repo
tar -cjf ${{ matrix.os }}-repo.tar.bz2 -C /tmp repo

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
id: artifact-upload
if: always()
with:
name: ${{ matrix.os }}-repo
path: ${{ matrix.os }}-repo.tar
path: ${{ matrix.os }}-repo.tar.bz2
compression-level: 0
retention-days: 2
if-no-files-found: ignore
archive: false

combine_repos:
if: always()
needs: [zfs-qemu-packages-jobs]
name: "Results"
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
id: artifact-download
if: always()
- name: Test Summary
if: always()
run: |
for i in $(find . -type f -iname "*.tar") ; do
for i in $(find . -type f -iname "*.tar.bz2") ; do
tar -xf $i -C /tmp
done
tar -cf all-repo.tar -C /tmp repo
tar -cjf all-repo.tar.bz2 -C /tmp repo

# If we're installing from a repo, print out the summary of the versions
# that got installed using Markdown.
Expand All @@ -146,12 +147,12 @@ jobs:
done
fi

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
id: artifact-upload2
if: always()
with:
name: all-repo
path: all-repo.tar
compression-level: 0
path: all-repo.tar.bz2
retention-days: 5
if-no-files-found: ignore
archive: false
16 changes: 9 additions & 7 deletions .github/workflows/zfs-qemu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
test_os: ${{ steps.os.outputs.os }}
ci_type: ${{ steps.os.outputs.ci_type }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Generate OS config and CI type
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
os: ${{ fromJson(needs.test-config.outputs.test_os) }}
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}

Expand Down Expand Up @@ -139,12 +139,13 @@ jobs:
timeout-minutes: 10
run: .github/workflows/scripts/qemu-7-prepare.sh

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
id: artifact-upload
if: always()
with:
name: Logs-functional-${{ matrix.os }}
path: /tmp/qemu-${{ matrix.os }}.tar
path: /tmp/qemu-${{ matrix.os }}.tar.bz2
archive: false
if-no-files-found: ignore

- name: Test Summary
Expand All @@ -158,10 +159,10 @@ jobs:
needs: [ qemu-vm ]

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
- name: Generating summary
run: .github/workflows/scripts/qemu-9-summary-page.sh
- name: Generating summary...
Expand Down Expand Up @@ -200,7 +201,8 @@ jobs:
run: .github/workflows/scripts/qemu-9-summary-page.sh 18
- name: Generating summary...
run: .github/workflows/scripts/qemu-9-summary-page.sh 19
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: Summary Files
path: out-*
archive: true
6 changes: 3 additions & 3 deletions .github/workflows/zloop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
WORK_DIR: /mnt/zloop
CORE_DIR: /mnt/zloop/cores
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Install dependencies
Expand Down Expand Up @@ -61,15 +61,15 @@ jobs:
if: failure()
run: |
cat $CORE_DIR/*/ztest.zdb
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: failure()
with:
name: Logs
path: |
/mnt/zloop/*/
!/mnt/zloop/cores/*/vdev/
if-no-files-found: ignore
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: failure()
with:
name: Pool files
Expand Down
Loading