Update tests
This commit is contained in:
parent
b5d19d7f65
commit
2ba4fe3305
8
.github/workflows/test_set_1.yml
vendored
8
.github/workflows/test_set_1.yml
vendored
@ -518,13 +518,13 @@ jobs:
|
|||||||
cp -f /opt/src/scripts/extras/vpnupgrade.sh ./vpnup.sh
|
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
|
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
|
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
|
||||||
bash vpnup.sh <<ANSWERS
|
bash vpnup.sh <<ANSWERS
|
||||||
|
|
||||||
ANSWERS
|
ANSWERS
|
||||||
restart_ipsec
|
restart_ipsec
|
||||||
[ -z "$ver" ] && ver=4.15
|
[ -z "$ver" ] && ver=5.0
|
||||||
ipsec --version | grep "$ver"
|
ipsec --version | grep "$ver"
|
||||||
ipsec status | grep -q l2tp-psk
|
ipsec status | grep -q l2tp-psk
|
||||||
ipsec status | grep -q xauth-psk
|
ipsec status | grep -q xauth-psk
|
||||||
@ -538,13 +538,13 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
|
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
|
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
|
||||||
bash vpnup.sh <<ANSWERS
|
bash vpnup.sh <<ANSWERS
|
||||||
|
|
||||||
ANSWERS
|
ANSWERS
|
||||||
restart_ipsec
|
restart_ipsec
|
||||||
[ -z "$ver" ] && ver=4.15
|
[ -z "$ver" ] && ver=5.0
|
||||||
ipsec --version | grep "$ver"
|
ipsec --version | grep "$ver"
|
||||||
ipsec status | grep -q l2tp-psk
|
ipsec status | grep -q l2tp-psk
|
||||||
ipsec status | grep -q xauth-psk
|
ipsec status | grep -q xauth-psk
|
||||||
|
10
.github/workflows/test_set_2.yml
vendored
10
.github/workflows/test_set_2.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
|||||||
if: github.repository_owner == 'hwdsl2'
|
if: github.repository_owner == 'hwdsl2'
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
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
|
fail-fast: false
|
||||||
container:
|
container:
|
||||||
image: ${{ matrix.os_version }}
|
image: ${{ matrix.os_version }}
|
||||||
@ -494,7 +494,7 @@ jobs:
|
|||||||
cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
|
cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
|
||||||
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.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
|
if [ "$os_type" = "alpine" ]; then
|
||||||
ipsec whack --shutdown || true
|
ipsec whack --shutdown || true
|
||||||
fi
|
fi
|
||||||
@ -503,7 +503,7 @@ jobs:
|
|||||||
|
|
||||||
ANSWERS
|
ANSWERS
|
||||||
restart_ipsec
|
restart_ipsec
|
||||||
[ -z "$ver" ] && ver=4.15
|
[ -z "$ver" ] && ver=5.0
|
||||||
ipsec --version | grep "$ver"
|
ipsec --version | grep "$ver"
|
||||||
ipsec status | grep -q l2tp-psk
|
ipsec status | grep -q l2tp-psk
|
||||||
ipsec status | grep -q xauth-psk
|
ipsec status | grep -q xauth-psk
|
||||||
@ -517,7 +517,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
|
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
|
if [ "$os_type" = "alpine" ]; then
|
||||||
ipsec whack --shutdown || true
|
ipsec whack --shutdown || true
|
||||||
fi
|
fi
|
||||||
@ -526,7 +526,7 @@ jobs:
|
|||||||
|
|
||||||
ANSWERS
|
ANSWERS
|
||||||
restart_ipsec
|
restart_ipsec
|
||||||
[ -z "$ver" ] && ver=4.15
|
[ -z "$ver" ] && ver=5.0
|
||||||
ipsec --version | grep "$ver"
|
ipsec --version | grep "$ver"
|
||||||
ipsec status | grep -q l2tp-psk
|
ipsec status | grep -q l2tp-psk
|
||||||
ipsec status | grep -q xauth-psk
|
ipsec status | grep -q xauth-psk
|
||||||
|
Loading…
Reference in New Issue
Block a user