commit d70980fce68d80195e598b770be4f034d5d24fc6
author William A. Kennington III <wak@google.com> Thu Nov 08 15:14:27 2018 -0800
committer Andrew Geissler <geissonator@yahoo.com> Mon Nov 19 20:39:32 2018 +0000
tree abaf04039d795cfe18878eee68a962816d36076a
parent 0c6ca414e4477c0171b7f43ef31cd9de687e80b7

run-unit-test-docker: Allow overriding workdir

There are some cases where we want to be able to override the location
of the build workspace inside the container and decouple the location
from the host location. This preserves the current behavior if
DOCKER_WORKDIR is not set.

Change-Id: I885f132e9da06ce9f3c1ddd9dfc7c69b9fb08cd4
Signed-off-by: William A. Kennington III <wak@google.com>

run-unit-test-docker.sh

diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index ef9b4c5..5a4427c 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -20,6 +20,7 @@
 DBUS_UNIT_TEST_PY="dbus-unit-test.py"
 DBUS_SYS_CONFIG_FILE=${dbus_sys_config_file:-"/usr/share/dbus-1/system.conf"}
 MAKEFLAGS="${MAKEFLAGS:-""}"
+DOCKER_WORKDIR="${DOCKER_WORKDIR:-$WORKSPACE}"
 
 # Timestamp for job
 echo "Unit test build started, $(date)"
@@ -64,17 +65,17 @@
 ./build-unit-test-docker.sh ${DOCKER_IMG_NAME} ${DISTRO}
 
 # Unit test and parameters
-UNIT_TEST="${WORKSPACE}/${UNIT_TEST_PY},-w,${WORKSPACE},-p,${UNIT_TEST_PKG},-v"
+UNIT_TEST="${DOCKER_WORKDIR}/${UNIT_TEST_PY},-w,${DOCKER_WORKDIR},-p,${UNIT_TEST_PKG},-v"
 
 # Run the docker unit test container with the unit test execution script
 echo "Executing docker image"
 docker run --cap-add=sys_admin --rm=true \
     --network host \
     --privileged=true \
-    -w "${WORKSPACE}" -v "${WORKSPACE}":"${WORKSPACE}" \
+    -w "${DOCKER_WORKDIR}" -v "${WORKSPACE}":"${DOCKER_WORKDIR}" \
     -e "MAKEFLAGS=${MAKEFLAGS}" \
     -t ${DOCKER_IMG_NAME} \
-    ${WORKSPACE}/${DBUS_UNIT_TEST_PY} -u ${UNIT_TEST} \
+    "${DOCKER_WORKDIR}"/${DBUS_UNIT_TEST_PY} -u ${UNIT_TEST} \
     -f ${DBUS_SYS_CONFIG_FILE}
 
 # Timestamp for build