1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-23 13:20:16 +00:00

CI/CD Fine tuning

Moved xenial script tests to After_script
Find script files instead of hardcoded scripts
This commit is contained in:
4s3ti 2021-02-06 22:46:08 +01:00
parent bccaa1bbee
commit d67095f3ef

View file

@ -22,32 +22,14 @@ branches:
jobs: jobs:
allow_failures: allow_failures:
- stage: lint - stage: lint
include: include:
- stage: lint - stage: lint
name: "Shellcheck lint" name: "Shellcheck lint"
dist: linux dist: linux
script: script:
- shellcheck autoinstall/install.sh - shellcheck autoinstall/install.sh
- shellcheck scripts/backup.sh - find scripts/ -type f -exec shellcheck {} \;
- shellcheck scripts/pivpn
- shellcheck scripts/self_check.sh
- shellcheck scripts/uninstall.sh
- shellcheck scripts/update.sh
- shellcheck scripts/openvpn/clientstat.sh
- shellcheck scripts/openvpn/listOVPN.sh
- shellcheck scripts/openvpn/makeOVPN.sh
- shellcheck scripts/openvpn/pivpnDebug.sh
- shellcheck scripts/openvpn/pivpn.sh
- shellcheck scripts/openvpn/removeOVPN.sh
- shellcheck scripts/wireguard/clientSTAT.sh
- shellcheck scripts/wireguard/disableCONF.sh
- shellcheck scripts/wireguard/enableCONF.sh
- shellcheck scripts/wireguard/listCONF.sh
- shellcheck scripts/wireguard/makeCONF.sh
- shellcheck scripts/wireguard/pivpnDEBUG.sh
- shellcheck scripts/wireguard/pivpn.sh
- shellcheck scripts/wireguard/qrcodeCONF.sh
- shellcheck scripts/wireguard/removeCONF.sh
- stage: test - stage: test
name: "OpenVPN Xenial & Commands" name: "OpenVPN Xenial & Commands"
@ -59,6 +41,7 @@ jobs:
- ./ciscripts/startup.sh -o - ./ciscripts/startup.sh -o
script: script:
- sudo ./auto_install/install.sh --unattended ciscripts/ci_openvpn.conf - sudo ./auto_install/install.sh --unattended ciscripts/ci_openvpn.conf
after_script:
- systemctl status openvpn - systemctl status openvpn
- pivpn add -n foo nopass -d 180 - pivpn add -n foo nopass -d 180
- pivpn add -p "$RANDOM$RANDOM" -n bar -d 180 - pivpn add -p "$RANDOM$RANDOM" -n bar -d 180
@ -81,6 +64,8 @@ jobs:
- ./ciscripts/startup.sh -w - ./ciscripts/startup.sh -w
script: script:
- sudo ./auto_install/install.sh --unattended ciscripts/ci_wireguard.conf - sudo ./auto_install/install.sh --unattended ciscripts/ci_wireguard.conf
after_script:
- systemctl status wg-quick@wg0
- pivpn add -n foo - pivpn add -n foo
- pivpn -qr foo - pivpn -qr foo
- pivpn -bk - pivpn -bk
@ -88,8 +73,6 @@ jobs:
- pivpn -l - pivpn -l
- pivpn -c - pivpn -c
- pivpn -r foo -y - pivpn -r foo -y
after_script:
- systemctl status wg-quick@wg0
after_fail: after_fail:
- sudo journalctl -xe - sudo journalctl -xe