From e494a047a02e043e5143db13a3531a366f53ea0a Mon Sep 17 00:00:00 2001 From: Mohamed Ashiq Liyazudeen Date: Thu, 18 May 2017 18:02:21 +0530 Subject: Travis CI update and disabling dockerfile_lint Travis now runs the test where it: * Builds the Dockerfile * Runs Docker image with required parameters * Verifies the state of the container Signed-off-by: Mohamed Ashiq Liyazudeen --- tests/Dockerfiletest/run.sh | 12 ------------ tests/Dockerfiletest/run_mask.sh | 12 ++++++++++++ tests/README.md | 6 +++++- 3 files changed, 17 insertions(+), 13 deletions(-) delete mode 100755 tests/Dockerfiletest/run.sh create mode 100755 tests/Dockerfiletest/run_mask.sh (limited to 'tests') diff --git a/tests/Dockerfiletest/run.sh b/tests/Dockerfiletest/run.sh deleted file mode 100755 index b82b810..0000000 --- a/tests/Dockerfiletest/run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -SCRIPT_DIR=$(cd $(dirname $0); pwd) - -echo "running tests in ${SCRIPT_DIR}" - -for test in ${SCRIPT_DIR}/test_*.sh ; do - $test - if [ $? -ne 0 ]; then - exit 1 - fi -done diff --git a/tests/Dockerfiletest/run_mask.sh b/tests/Dockerfiletest/run_mask.sh new file mode 100755 index 0000000..b82b810 --- /dev/null +++ b/tests/Dockerfiletest/run_mask.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +SCRIPT_DIR=$(cd $(dirname $0); pwd) + +echo "running tests in ${SCRIPT_DIR}" + +for test in ${SCRIPT_DIR}/test_*.sh ; do + $test + if [ $? -ne 0 ]; then + exit 1 + fi +done diff --git a/tests/README.md b/tests/README.md index 501af35..2d825d4 100644 --- a/tests/README.md +++ b/tests/README.md @@ -22,10 +22,14 @@ Install with * `dnf install ShellCheck`, or * `apt-get install shellcheck` +## Travis CI +* dockerfile_lint has dependency problem, hence disabling it. +* Builds the docker image and does a basic test. +* Tests the shell script. + ## TODOs * Write more tests -* More elaborate basic tests - docker build, docker run of basic commands. * Write full functional tests to be run in vms. (like the atomic vagrant environment) -- cgit v1.2.3