update local docker continuous test runner

Signed-off-by: Leandro Dorileo <[email protected]>

docker/Dockerfile

@@ -11,6 +11,7 @@
 
 FROM clearlinux:latest
 ADD dockerrun.sh /dockerrun.sh
-RUN swupd update && swupd bundle-add c-basic dev-utils-dev
+RUN swupd bundle-add os-core-update-dev c-basic dev-utils-dev
+RUN swupd update
 
 CMD ["/dockerrun.sh"]

docker/dockerrun.sh

@@ -20,34 +20,4 @@ fi
 # Copy all the files across to prevent contaminating the bind mount
 cp -Ra /source/. /build
 
-die_fatal()
-{
-    exit 1
-}
-
-die_log_fatal()
-{
-    if [[ -e test-suite.log ]]; then
-        cat test-suite.log
-    else
-        echo "test-suite.log is missing." >&2
-    fi
-    exit 1
-}
-
-./autogen.sh --enable-coverage || die_fatal
-
-# Build error
-make || die_fatal
-
-# Test suite failure, print the log
-make check || die_log_fatal
-
-# tarbal issue, just die
-make distcheck || die_fatal
-
-# Actually checkable on host, but dump log anyway
-make check-valgrind || die_log_fatal
-
-# At this point, we can emit our current coverage to the tty
-make coverage
+./scripts/run-test-suite.sh || exit 1

scripts/continuous.sh

@@ -13,6 +13,7 @@
 DIRN="$(basename $(pwd))"
 PROJ_NAME="clr-boot-manager"
 PROJ_CI_NAME="docker-ci-${PROJ_NAME}"
+FORCE_BUILD=${FORCE_BUILD:-"false"}
 
 # Check docker is available
 if ! type docker &>/dev/null; then
@@ -33,7 +34,7 @@ if [[ "${DIRN}" != "${PROJ_NAME}" ]]; then
 fi
 
 # Check that docker-ci image is installed
-if ! docker inspect "${PROJ_CI_NAME}" &>/dev/null; then
+if ! docker inspect "${PROJ_CI_NAME}" || "$FORCE_BUILD" = "true" &>/dev/null; then
     echo "${PROJ_CI_NAME} not installed, building docker image.."
     echo "....Please wait, this may take some time."
     docker build -t "${PROJ_CI_NAME}" docker/ || exit 1