Update tests

Author: hwdsl2

.github/workflows/main.yml

@@ -9,10 +9,15 @@ on:
     paths:
       - '**.sh'
       - '.github/workflows/main.yml'
+      - '.github/workflows/test_set_1.yml'
       - '.github/workflows/test_set_2.yml'
       - '.github/workflows/test_set_3.yml'
 
 jobs:
+  test_set_1:
+    if: github.repository_owner == 'hwdsl2'
+    uses: ./.github/workflows/test_set_1.yml
+
   test_set_2:
     if: github.repository_owner == 'hwdsl2'
     uses: ./.github/workflows/test_set_2.yml

.github/workflows/test_set_1.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.repository_owner == 'hwdsl2'
     strategy:
       matrix:
-        os_version: ["centos:9s", "rockylinux:8", "almalinux:9", "almalinux:8"]
+        os_version: ["centos:10s", "centos:9s", "rockylinux:8", "almalinux:10", "almalinux:9", "almalinux:8"]
       fail-fast: false
     env:
       OS_VERSION: ${{ matrix.os_version }}
@@ -41,7 +41,9 @@ jobs:
           }
 
           cd /opt/src
-          yum -y -q update
+          if grep -qs -i rocky /etc/redhat-release; then
+            yum -y -q update
+          fi
           yum -y -q install wget kmod procps-ng net-tools
           rm -f /usr/bin/systemd-detect-virt
 
@@ -143,6 +145,8 @@ jobs:
 
           if [ "$OS_VERSION" = "centos:9s" ]; then
             echo "FROM quay.io/centos/centos:stream9" > Dockerfile
+          elif [ "$OS_VERSION" = "centos:10s" ]; then
+            echo "FROM quay.io/centos/centos:stream10" > Dockerfile
           elif [ "$OS_VERSION" = "centos:8s" ]; then
             echo "FROM quay.io/centos/centos:stream8" > Dockerfile
           else
@@ -151,17 +155,15 @@ jobs:
 
           cat >> Dockerfile <<'EOF'
 
-          ENV container docker
+          ENV container=docker
           WORKDIR /opt/src
-
           EOF
 
-          if [ "$OS_VERSION" = "centos:9s" ]; then
+          if [ "$OS_VERSION" = "centos:9s" ] || [ "$OS_VERSION" = "centos:10s" ]; then
             echo "RUN yum -y -q install systemd" >> Dockerfile
           fi
 
           cat >> Dockerfile <<'EOF'
-
           RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ "$i" = \
           systemd-tmpfiles-setup.service ] || rm -f "$i"; done); \
           rm -f /lib/systemd/system/multi-user.target.wants/*; \
@@ -186,8 +188,8 @@ jobs:
 
       - name: Test
         run: |
-          docker run -d --name "${OS_VERSION//:}-test-1" -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
-            --privileged "${OS_VERSION//:}-test"
+          docker run -d --name "${OS_VERSION//:}-test-1" -v /sys/fs/cgroup:/sys/fs/cgroup:rw \
+            --cgroupns=host --privileged "${OS_VERSION//:}-test"
           sleep 5
           docker exec "${OS_VERSION//:}-test-1" /opt/src/run.sh "${OS_VERSION::6}"
 
@@ -196,4 +198,4 @@ jobs:
         run: |
           rm -rf "$GITHUB_WORKSPACE/testing/${OS_VERSION//:}"
           docker rm -f "${OS_VERSION//:}-test-1" || true
-          docker rmi "${OS_VERSION//:}-test" || true
+          docker rmi "${OS_VERSION//:}-test" || true

.github/workflows/test_set_2.yml

@@ -30,7 +30,6 @@ jobs:
 
           export DEBIAN_FRONTEND=noninteractive
           apt-get -yqq update
-          apt-get -yqq dist-upgrade
           apt-get -yqq install wget kmod procps net-tools
 
           cp -f "$GITHUB_WORKSPACE"/wireguard-install.sh ./wireguard.sh

.github/workflows/test_set_3.yml

@@ -27,7 +27,6 @@ jobs:
 
           export DEBIAN_FRONTEND=noninteractive
           sudo apt-get -yqq update
-          sudo apt-get -yqq dist-upgrade
           sudo apt-get -yqq install wget
 
           cp -f "$GITHUB_WORKSPACE"/wireguard-install.sh ./wireguard.sh