aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorTino Reichardt <[email protected]>2024-01-26 23:22:26 +0100
committerBrian Behlendorf <[email protected]>2024-01-29 14:53:29 -0800
commit9ad150446fad14b1de6baf2b8bdef4a8965e6030 (patch)
treeb1a46abc50f6dc53f5924da53679a7884e5a2382 /.github
parent9da745f5de73487e14e6dfd65130b1677f84518a (diff)
ZTS: Update deprecated Github Action version numbers
GitHub Actions is transitioning from Node 16 to Node 20. So we need to update these: - actions/checkout@v3 -> v4 - actions/download-artifact@v3 -> v4 - actions/upload-artifact@v3 -> v4 and some minor changes Update also the documentation of the testings workflow. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Andrew Innes <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes #15820
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/README.md41
-rw-r--r--.github/workflows/checkstyle.yaml4
-rw-r--r--.github/workflows/codeql.yml2
-rwxr-xr-x.github/workflows/scripts/generate-summary.sh2
-rw-r--r--.github/workflows/zfs-linux-tests.yml22
-rw-r--r--.github/workflows/zfs-linux.yml8
6 files changed, 42 insertions, 37 deletions
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 8255dd210..ab0555dcd 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -4,44 +4,49 @@
```mermaid
flowchart TB
subgraph CleanUp and Summary
- Part1-20.04-->CleanUp+nice+Summary
- Part2-20.04-->CleanUp+nice+Summary
- PartN-20.04-->CleanUp+nice+Summary
- Part1-22.04-->CleanUp+nice+Summary
- Part2-22.04-->CleanUp+nice+Summary
- PartN-22.04-->CleanUp+nice+Summary
+ sanity-checks-20.04-->CleanUp+Summary
+ Part1-20.04-->CleanUp+Summary
+ Part2-20.04-->CleanUp+Summary
+ Part3-20.04-->CleanUp+Summary
+ Part4-20.04-->CleanUp+Summary
+ Part1-22.04-->CleanUp+Summary
+ Part2-22.04-->CleanUp+Summary
+ Part3-22.04-->CleanUp+Summary
+ Part4-22.04-->CleanUp+Summary
+ sanity-checks-22.04-->CleanUp+Summary
end
subgraph Functional Testings
+ sanity-checks-20.04
+ zloop-checks-20.04
functional-testing-20.04-->Part1-20.04
functional-testing-20.04-->Part2-20.04
- functional-testing-20.04-->PartN-20.04
+ functional-testing-20.04-->Part3-20.04
+ functional-testing-20.04-->Part4-20.04
functional-testing-22.04-->Part1-22.04
functional-testing-22.04-->Part2-22.04
- functional-testing-22.04-->PartN-22.04
-end
-
-subgraph Sanity and zloop Testings
- sanity-checks-20.04-->functional-testing-20.04
- sanity-checks-22.04-->functional-testing-22.04
- zloop-checks-20.04-->functional
- zloop-checks-22.04-->functional
+ functional-testing-22.04-->Part3-22.04
+ functional-testing-22.04-->Part4-22.04
+ sanity-checks-22.04
+ zloop-checks-22.04
end
subgraph Code Checking + Building
+ Build-Ubuntu-20.04-->sanity-checks-20.04
+ Build-Ubuntu-20.04-->zloop-checks-20.04
+ Build-Ubuntu-20.04-->functional-testing-20.04
codeql.yml
checkstyle.yml
- Build-Ubuntu-20.04-->sanity-checks-20.04
Build-Ubuntu-22.04-->sanity-checks-22.04
- Build-Ubuntu-20.04-->zloop-checks-20.04
Build-Ubuntu-22.04-->zloop-checks-22.04
+ Build-Ubuntu-22.04-->functional-testing-22.04
end
```
1) build zfs modules for Ubuntu 20.04 and 22.04 (~15m)
2) 2x zloop test (~10m) + 2x sanity test (~25m)
-3) functional testings in parts 1..5 (each ~1h)
+3) 4x functional testings in parts 1..4 (each ~1h)
4) cleanup and create summary
- content of summary depends on the results of the steps
diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
index b0fdc570d..abcb358fc 100644
--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@@ -8,7 +8,7 @@ jobs:
checkstyle:
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Install dependencies
@@ -52,7 +52,7 @@ jobs:
if: failure() && steps.CheckABI.outcome == 'failure'
run: |
find -name *.abi | tar -cf abi_files.tar -T -
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
if: failure() && steps.CheckABI.outcome == 'failure'
with:
name: New ABI files (use only if you're sure about interface changes)
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 7ccfc1492..e015b2cb7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
diff --git a/.github/workflows/scripts/generate-summary.sh b/.github/workflows/scripts/generate-summary.sh
index cd5ea3421..b5d89208a 100755
--- a/.github/workflows/scripts/generate-summary.sh
+++ b/.github/workflows/scripts/generate-summary.sh
@@ -87,7 +87,7 @@ function summarize_f() {
output "\n## $headline\n"
rm -rf testfiles
for i in $(seq 1 $FUNCTIONAL_PARTS); do
- tarfile="$2/part$i.tar"
+ tarfile="$2-part$i/part$i.tar"
check_tarfile "$tarfile"
check_logfile "testfiles/log"
done
diff --git a/.github/workflows/zfs-linux-tests.yml b/.github/workflows/zfs-linux-tests.yml
index c4fe930d0..753f3cd02 100644
--- a/.github/workflows/zfs-linux-tests.yml
+++ b/.github/workflows/zfs-linux-tests.yml
@@ -13,10 +13,10 @@ jobs:
zloop:
runs-on: ubuntu-${{ inputs.os }}
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
with:
name: modules-${{ inputs.os }}
- name: Install modules
@@ -34,7 +34,7 @@ jobs:
if: failure()
run: |
sudo chmod +r -R /var/tmp/zloop/
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
if: failure()
with:
name: Zpool-logs-${{ inputs.os }}
@@ -43,7 +43,7 @@ jobs:
!/var/tmp/zloop/*/vdev/
retention-days: 14
if-no-files-found: ignore
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
if: failure()
with:
name: Zpool-files-${{ inputs.os }}
@@ -55,10 +55,10 @@ jobs:
sanity:
runs-on: ubuntu-${{ inputs.os }}
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
with:
name: modules-${{ inputs.os }}
- name: Install modules
@@ -77,7 +77,7 @@ jobs:
RESPATH="/var/tmp/test_results"
mv -f $RESPATH/current $RESPATH/testfiles
tar cf $RESPATH/sanity.tar -h -C $RESPATH testfiles
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: Logs-${{ inputs.os }}-sanity
@@ -91,10 +91,10 @@ jobs:
matrix:
tests: [ part1, part2, part3, part4 ]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
with:
name: modules-${{ inputs.os }}
- name: Install modules
@@ -116,9 +116,9 @@ jobs:
RESPATH="/var/tmp/test_results"
mv -f $RESPATH/current $RESPATH/testfiles
tar cf $RESPATH/${{ matrix.tests }}.tar -h -C $RESPATH testfiles
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
if: success() || failure()
with:
- name: Logs-${{ inputs.os }}-functional
+ name: Logs-${{ inputs.os }}-functional-${{ matrix.tests }}
path: /var/tmp/test_results/${{ matrix.tests }}.tar
if-no-files-found: ignore
diff --git a/.github/workflows/zfs-linux.yml b/.github/workflows/zfs-linux.yml
index be3908deb..e6b705c86 100644
--- a/.github/workflows/zfs-linux.yml
+++ b/.github/workflows/zfs-linux.yml
@@ -14,14 +14,14 @@ jobs:
os: [20.04, 22.04]
runs-on: ubuntu-${{ matrix.os }}
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Build modules
run: .github/workflows/scripts/setup-dependencies.sh build
- name: Prepare modules upload
run: tar czf modules-${{ matrix.os }}.tgz *.deb .github tests/test-runner tests/ImageOS.txt
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: modules-${{ matrix.os }}
path: modules-${{ matrix.os }}.tgz
@@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-22.04
needs: testings
steps:
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
- name: Generating summary
run: |
tar xzf modules-22.04/modules-22.04.tgz .github tests
@@ -58,7 +58,7 @@ jobs:
run: .github/workflows/scripts/generate-summary.sh 3
- name: Summary for errors #4
run: .github/workflows/scripts/generate-summary.sh 4
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
with:
name: Summary Files
path: Summary/