diff --git a/test/testBuild.sh b/test/testBuild.sh deleted file mode 100644 index b644427..0000000 --- a/test/testBuild.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ "${DEBUGGING:?}" = "true" ]; then - set -o xtrace -fi - -set -o errexit -set -o nounset -set -o pipefail - -docker rmi "jusito/docker-ttt:ubuntu" || true -docker build -t "jusito/docker-ttt:ubuntu" "." \ No newline at end of file diff --git a/test/testCaseQuick.sh b/test/testCaseQuick.sh index 4a2d515..d60c024 100644 --- a/test/testCaseQuick.sh +++ b/test/testCaseQuick.sh @@ -2,6 +2,8 @@ if [ "${DEBUGGING}" = "true" ]; then set -o xtrace +else + DEBUGGING="false" fi set -o errexit @@ -10,11 +12,20 @@ set -o pipefail #bash test/testStyle.sh -echo "[testBuild][INFO]build docker-ttt:ubuntu" -docker rmi "jusito/docker-ttt:ubuntu" || true -docker build -t "jusito/docker-ttt:ubuntu" "." -echo "[testRun][INFO]running docker-ttt:ubuntu" -if ! docker run -ti --name "JusitoTesting" --rm -e TEST_MODE=true -e DEBUGGING="${DEBUGGING}" "jusito/docker-ttt:ubuntu"; then +echo "[testBuild][INFO]build" + +docker rmi "jusito/docker-ttt:lgsm_debian" || true +docker build -t "jusito/docker-ttt:lgsm_debian" "./lgsm/" + +docker rmi "jusito/docker-ttt:gmod_debian" || true +docker build -t "jusito/docker-ttt:gmod_debian" "./gmod/" + +docker rmi "jusito/docker-ttt:gmod_ttt_debian" || true +docker build -t "jusito/docker-ttt:gmod_ttt_debian" "./TTT/" + + +echo "[testRun][INFO]running" +if ! docker run -ti --name "JusitoTesting" --rm -e TEST_MODE=true -e DEBUGGING="$DEBUGGING" "jusito/docker-ttt:gmod_ttt_debian"; then echo "[testRun][ERROR]run test failed for docker-ttt:ubuntu" exit 1 fi diff --git a/test/testCaseQuick2.sh b/test/testCaseQuick2.sh deleted file mode 100644 index d60c024..0000000 --- a/test/testCaseQuick2.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -if [ "${DEBUGGING}" = "true" ]; then - set -o xtrace -else - DEBUGGING="false" -fi - -set -o errexit -set -o nounset -set -o pipefail - -#bash test/testStyle.sh - -echo "[testBuild][INFO]build" - -docker rmi "jusito/docker-ttt:lgsm_debian" || true -docker build -t "jusito/docker-ttt:lgsm_debian" "./lgsm/" - -docker rmi "jusito/docker-ttt:gmod_debian" || true -docker build -t "jusito/docker-ttt:gmod_debian" "./gmod/" - -docker rmi "jusito/docker-ttt:gmod_ttt_debian" || true -docker build -t "jusito/docker-ttt:gmod_ttt_debian" "./TTT/" - - -echo "[testRun][INFO]running" -if ! docker run -ti --name "JusitoTesting" --rm -e TEST_MODE=true -e DEBUGGING="$DEBUGGING" "jusito/docker-ttt:gmod_ttt_debian"; then - echo "[testRun][ERROR]run test failed for docker-ttt:ubuntu" - exit 1 -fi -docker stop "JusitoTesting" || true -docker rm "JusitoTesting" || true \ No newline at end of file diff --git a/test/testRun.sh b/test/testRun.sh deleted file mode 100644 index 8959e2a..0000000 --- a/test/testRun.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ "${DEBUGGING:?}" = "true" ]; then - set -o xtrace -fi - -set -o errexit -set -o nounset -set -o pipefail - -docker stop "JusitoTesting" || true -docker rm "JusitoTesting" || true - -echo "[testRun][INFO]running docker-ttt:ubuntu" -if ! docker run -ti --name "JusitoTesting" --rm -e TEST_MODE=true -e DEBUGGING="${DEBUGGING}" "jusito/docker-ttt:ubuntu"; then - echo "[testRun][ERROR]run test failed for docker-ttt:ubuntu" - exit 1 -fi -docker stop "JusitoTesting" || true -docker rm "JusitoTesting" || true \ No newline at end of file