From 480d809703c55f54f2ea8b69d22ea36346cfd5e2 Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-zfs@mcmilk.de>
Date: Thu, 16 Mar 2023 18:00:14 +0100
Subject: [PATCH] Refine some details for the github actions update

Set the retention-days variable to 14 days for these artifacts:
- the zloop error logs
- the zloop vdev files
- the compiled modules

Add the abality to re-run some part of the functional testings.
Fix some comments and remove the deleting of the modules artifact.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de>
Closes #14637
---
 .../workflows/scripts/setup-dependencies.sh   |  2 +-
 .github/workflows/zfs-linux-tests.yml         |  2 ++
 .github/workflows/zfs-linux.yml               | 29 +++++++------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/scripts/setup-dependencies.sh b/.github/workflows/scripts/setup-dependencies.sh
index c788f0afa..440d5e8e5 100755
--- a/.github/workflows/scripts/setup-dependencies.sh
+++ b/.github/workflows/scripts/setup-dependencies.sh
@@ -37,7 +37,7 @@ function mod_install() {
   fi
 
   echo "::group::Install and load modules"
-  # delete kernel-shipped zfs modules, be sure about correct modules
+  # don't use kernel-shipped zfs modules
   sudo sed -i.bak 's/updates/extra updates/' /etc/depmod.d/ubuntu.conf
   sudo apt-get install --fix-missing ./*.deb
 
diff --git a/.github/workflows/zfs-linux-tests.yml b/.github/workflows/zfs-linux-tests.yml
index f72ff7f5a..c4fe930d0 100644
--- a/.github/workflows/zfs-linux-tests.yml
+++ b/.github/workflows/zfs-linux-tests.yml
@@ -41,6 +41,7 @@ jobs:
         path: |
           /var/tmp/zloop/*/
           !/var/tmp/zloop/*/vdev/
+        retention-days: 14
         if-no-files-found: ignore
     - uses: actions/upload-artifact@v3
       if: failure()
@@ -48,6 +49,7 @@ jobs:
         name: Zpool-files-${{ inputs.os }}
         path: |
           /var/tmp/zloop/*/vdev/
+        retention-days: 14
         if-no-files-found: ignore
 
   sanity:
diff --git a/.github/workflows/zfs-linux.yml b/.github/workflows/zfs-linux.yml
index 4681bea50..be3908deb 100644
--- a/.github/workflows/zfs-linux.yml
+++ b/.github/workflows/zfs-linux.yml
@@ -20,17 +20,12 @@ jobs:
     - name: Build modules
       run: .github/workflows/scripts/setup-dependencies.sh build
     - name: Prepare modules upload
-      run: tar czf modules-${{ matrix.os }}.tgz *.deb .github scripts/zfs-tests-color.sh tests/test-runner tests/ImageOS.txt
+      run: tar czf modules-${{ matrix.os }}.tgz *.deb .github tests/test-runner tests/ImageOS.txt
     - uses: actions/upload-artifact@v3
       with:
         name: modules-${{ matrix.os }}
         path: modules-${{ matrix.os }}.tgz
-    - name: Prepare scripts upload
-      run: tar czf scripts.tgz .github tests/test-runner
-    - uses: actions/upload-artifact@v3
-      with:
-        name: scripts
-        path: scripts.tgz
+        retention-days: 14
 
   testings:
     name: Testing
@@ -52,20 +47,18 @@ jobs:
     - uses: actions/download-artifact@v3
     - name: Generating summary
       run: |
-        tar xzf scripts/scripts.tgz .github tests
+        tar xzf modules-22.04/modules-22.04.tgz .github tests
         .github/workflows/scripts/generate-summary.sh
     # up to 4 steps, each can have 1 MiB output (for debugging log files)
-    - run: .github/workflows/scripts/generate-summary.sh 1
-    - run: .github/workflows/scripts/generate-summary.sh 2
-    - run: .github/workflows/scripts/generate-summary.sh 3
-    - run: .github/workflows/scripts/generate-summary.sh 4
+    - name: Summary for errors #1
+      run: .github/workflows/scripts/generate-summary.sh 1
+    - name: Summary for errors #2
+      run: .github/workflows/scripts/generate-summary.sh 2
+    - name: Summary for errors #3
+      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
       with:
         name: Summary Files
         path: Summary/
-    - uses: geekyeggo/delete-artifact@v2
-      with:
-        name: modules-20.04
-    - uses: geekyeggo/delete-artifact@v2
-      with:
-        name: modules-22.04