From f96af75dbd5f607ed1b11f4eb8f8e5ef6ff02ce5 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sun, 20 Mar 2022 23:21:23 -0500 Subject: [PATCH] Update tests --- .github/workflows/test_set_1.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml index 9b3eada..480a6b1 100644 --- a/.github/workflows/test_set_1.yml +++ b/.github/workflows/test_set_1.yml @@ -17,7 +17,7 @@ jobs: if: github.repository_owner == 'hwdsl2' strategy: matrix: - os_version: ["centos:8s", "centos:7", "rockylinux:8", "almalinux:8", "amazonlinux:2"] + os_version: ["centos:8s", "centos:7", "rockylinux:8", "almalinux:8", "amazonlinux:2", "oraclelinux:8", "oraclelinux:7"] fail-fast: false env: OS_VERSION: ${{ matrix.os_version }} @@ -51,6 +51,9 @@ jobs: } restart_ipsec() { + if grep -qs 'release 8' /etc/oracle-release; then + return 0 + fi if ! command -v amazon-linux-extras; then systemctl restart ipsec fi @@ -126,7 +129,8 @@ jobs: ANSWERS rm -f /usr/bin/ikev2.sh /opt/src/ikev2.sh rm -f /etc/ipsec.d/vpnclient* - if grep -qi stream /etc/redhat-release; then + if grep -qi stream /etc/redhat-release \ + || grep -qs 'release 8' /etc/oracle-release; then mkdir /etc/xl2tpd fi done