commit a61acb506868fdca84a2bd50f16ed3023d48521d
author Andrew Geissler <geissonator@yahoo.com> Thu Jan 03 16:32:44 2019 -0600
committer Andrew Geissler <geissonator@yahoo.com> Tue Jan 08 14:15:25 2019 -0600
tree bad8bd612e1b677d67e62aac651a75a974ec14ac
parent 9f980d7318993922a50f6e7a038e164def3082dd

Support branch option in unit-test script

Building on the support of the branch option within the
docker container, add it to unit-test for any dependent
repositories that do not get built into the docker
container

Testing:
- Verified with no branch input, worked as expected
- Verified with invalid branch, master was still used

Change-Id: I4f57d6165287ffe3b4e2f0377292128474199ca3
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

run-unit-test-docker.sh

diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index d2a86f1..2ebc224 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -29,7 +29,8 @@
 set -uo pipefail
 
 # Default variables
-DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-unit-test-${BRANCH:-master}"}
+BRANCH=${BRANCH:-"master"}
+DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-unit-test-${BRANCH}"}
 DISTRO=${DISTRO:-ubuntu:bionic}
 OBMC_BUILD_SCRIPTS="openbmc-build-scripts"
 UNIT_TEST_PY_DIR="scripts"
@@ -87,7 +88,8 @@
 ./build-unit-test-docker.sh
 
 # Unit test and parameters
-UNIT_TEST="${DOCKER_WORKDIR}/${UNIT_TEST_PY},-w,${DOCKER_WORKDIR},-p,${UNIT_TEST_PKG},-v"
+UNIT_TEST="${DOCKER_WORKDIR}/${UNIT_TEST_PY},-w,${DOCKER_WORKDIR},\
+-p,${UNIT_TEST_PKG},-b,$BRANCH,-v"
 
 # Run the docker unit test container with the unit test execution script
 echo "Executing docker image"