From 2ba4fe33050b3f20bc06548c2b26f5380295afd8 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 2 May 2024 21:39:42 -0500
Subject: [PATCH] Update tests

---
 .github/workflows/test_set_1.yml |  8 ++++----
 .github/workflows/test_set_2.yml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml
index 918e244..2ed65cc 100644
--- a/.github/workflows/test_set_1.yml
+++ b/.github/workflows/test_set_1.yml
@@ -518,13 +518,13 @@ jobs:
           cp -f /opt/src/scripts/extras/vpnupgrade.sh ./vpnup.sh
           sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
 
-          for ver in 4.12 ""; do
+          for ver in 4.14 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=4.15
+            [ -z "$ver" ] && ver=5.0
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -538,13 +538,13 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.14 ""; do
+          for ver in 4.15 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=4.15
+            [ -z "$ver" ] && ver=5.0
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
diff --git a/.github/workflows/test_set_2.yml b/.github/workflows/test_set_2.yml
index 14d349d..6d80b87 100644
--- a/.github/workflows/test_set_2.yml
+++ b/.github/workflows/test_set_2.yml
@@ -17,7 +17,7 @@ jobs:
     if: github.repository_owner == 'hwdsl2'
     strategy:
       matrix:
-        os_version: ["ubuntu:24.04", "ubuntu:22.04", "ubuntu:20.04", "debian:12", "debian:11", "debian:10", "alpine:3.19", "alpine:3.18"]
+        os_version: ["ubuntu:22.04", "ubuntu:20.04", "debian:12", "debian:11", "debian:10", "alpine:3.19", "alpine:3.18"]
       fail-fast: false
     container:
       image: ${{ matrix.os_version }}
@@ -494,7 +494,7 @@ jobs:
           cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
           sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
 
-          for ver in 4.12 ""; do
+          for ver in 4.14 ""; do
             if [ "$os_type" = "alpine" ]; then
               ipsec whack --shutdown || true
             fi
@@ -503,7 +503,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=4.15
+            [ -z "$ver" ] && ver=5.0
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -517,7 +517,7 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.14 ""; do
+          for ver in 4.15 ""; do
             if [ "$os_type" = "alpine" ]; then
               ipsec whack --shutdown || true
             fi
@@ -526,7 +526,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=4.15
+            [ -z "$ver" ] && ver=5.0
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk