From 9e7fc5da3806b971304d13d513ea1504c7fe98f6 Mon Sep 17 00:00:00 2001
From: szubersk <szuberskidamian@gmail.com>
Date: Sat, 12 Nov 2022 22:48:32 +1000
Subject: [PATCH] Ubuntu 22.04 integration: GitHub workflows

- GitHub workflows are run on Ubuntu 22.04

- Extract the `checkstyle` workflow dependencies to a separate file.

- Refresh the `build-dependencies.txt` list.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: szubersk <szuberskidamian@gmail.com>
Closes #14148
---
 .github/workflows/build-dependencies.txt      | 6 ++++--
 .github/workflows/checkstyle-dependencies.txt | 5 +++++
 .github/workflows/checkstyle.yaml             | 5 +++--
 .github/workflows/zfs-tests-functional.yml    | 8 ++++++--
 .github/workflows/zfs-tests-sanity.yml        | 5 +++--
 .github/workflows/zloop.yml                   | 5 +++--
 6 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/checkstyle-dependencies.txt

diff --git a/.github/workflows/build-dependencies.txt b/.github/workflows/build-dependencies.txt
index e59139900..482d82fff 100644
--- a/.github/workflows/build-dependencies.txt
+++ b/.github/workflows/build-dependencies.txt
@@ -23,10 +23,11 @@ libelf-dev
 libffi-dev
 libmount-dev
 libpam0g-dev
-libselinux-dev
+libselinux1-dev
 libssl-dev
 libtool
 libudev-dev
+linux-headers-generic
 lsscsi
 mdadm
 nfs-kernel-server
@@ -36,8 +37,9 @@ python3
 python3-cffi
 python3-dev
 python3-packaging
+python3-pip
 python3-setuptools
-rng-tools
+rng-tools-debian
 rsync
 samba
 sysstat
diff --git a/.github/workflows/checkstyle-dependencies.txt b/.github/workflows/checkstyle-dependencies.txt
new file mode 100644
index 000000000..879d3dbc5
--- /dev/null
+++ b/.github/workflows/checkstyle-dependencies.txt
@@ -0,0 +1,5 @@
+cppcheck
+devscripts
+mandoc
+pax-utils
+shellcheck
diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
index 2e593e0a5..008adcc03 100644
--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   checkstyle:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -14,8 +14,9 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
+        sudo apt-get -qq upgrade
         sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
-        sudo apt-get install -qq mandoc cppcheck pax-utils devscripts
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/checkstyle-dependencies.txt apt-get install -qq
         sudo python3 -m pip install --quiet flake8
         sudo apt-get clean
 
diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
index 1c2b2b804..236bf599f 100644
--- a/.github/workflows/zfs-tests-functional.yml
+++ b/.github/workflows/zfs-tests-functional.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [18.04, 20.04]
+        os: [18.04, 20.04, 22.04]
     runs-on: ubuntu-${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -21,7 +21,11 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt sudo apt-get install -qq
+        sudo apt-get -qq upgrade
+        if [ "${{ matrix.os }}" = "18.04" ]; then
+          sed -i.bak 's/rng-tools-debian/rng-tools/' ${{ github.workspace }}/.github/workflows/build-dependencies.txt
+        fi
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
         sudo apt-get clean
     - name: Autogen.sh
       run: |
diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
index ace046ad1..f3fc607cb 100644
--- a/.github/workflows/zfs-tests-sanity.yml
+++ b/.github/workflows/zfs-tests-sanity.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -17,7 +17,8 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt sudo apt-get install -qq
+        sudo apt-get -qq upgrade
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
         sudo apt-get clean
     - name: Autogen.sh
       run: |
diff --git a/.github/workflows/zloop.yml b/.github/workflows/zloop.yml
index 807a1bc46..1a234ac99 100644
--- a/.github/workflows/zloop.yml
+++ b/.github/workflows/zloop.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       TEST_DIR: /var/tmp/zloop
     steps:
@@ -16,7 +16,8 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt sudo apt-get install -qq
+        sudo apt-get -qq upgrade
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
         sudo apt-get clean
     - name: Autogen.sh
       run: |