From 963a49d61ad7a0d11d7fd2cba3e7fc55e21f5a1e Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Thu, 26 May 2022 00:16:51 -0500
Subject: [PATCH] Update tests

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

diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml
index 51fcdac..f2d4182 100644
--- a/.github/workflows/test_set_1.yml
+++ b/.github/workflows/test_set_1.yml
@@ -465,12 +465,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.4 ""; do
+          for ver in 4.5 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -484,12 +485,13 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.5 ""; do
+          for ver in 4.6 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             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 b7fc0eb..6c2ae9d 100644
--- a/.github/workflows/test_set_2.yml
+++ b/.github/workflows/test_set_2.yml
@@ -77,7 +77,7 @@ jobs:
           echo "# hwdsl2" > run.sh
 
           if [ "$os_type" = "alpine" ]; then
-            apk add -U wget rsyslog sed
+            apk add -U wget rsyslog sed bash
             rsyslogd
           else
             export DEBIAN_FRONTEND=noninteractive
@@ -480,8 +480,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
 
-          [ "$os_type" = "alpine" ] && ver1=4.5 || ver1=4.4
-          for ver in "$ver1" ""; do
+          for ver in 4.5 ""; do
             if [ "$os_type" = "alpine" ]; then
               ipsec whack --shutdown || true
             fi
@@ -490,6 +489,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -503,7 +503,7 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.5 ""; do
+          for ver in 4.6 ""; do
             if [ "$os_type" = "alpine" ]; then
               ipsec whack --shutdown || true
             fi
@@ -512,6 +512,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
+            [ -z "$ver" ] && ver=4.7
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk