utilize DISTRO default from build-unit-test-docker
Both run-unit-test-docker.sh and build-unit-test-docker have a default
for DISTRO. We don't want users to have to update both when
changing the default use the common denominator which is
build-unit-test-docker.
Change-Id: Id2813570d1104c97ee6d8737960a103c1e028b52
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index ef4d897..b3ecde9 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -16,7 +16,6 @@
# be tested
# WORKSPACE: Required, location of unit test scripts and repository
# code to test
-# DISTRO: Optional, docker base image (ubuntu or fedora)
# BRANCH: Optional, branch to build from each of the
# openbmc repositories. default is master, which will be
# used if input branch not provided or not found
@@ -30,7 +29,6 @@
# Default variables
BRANCH=${BRANCH:-"master"}
-DISTRO=${DISTRO:-ubuntu:focal}
OBMC_BUILD_SCRIPTS="openbmc-build-scripts"
UNIT_TEST_PY_DIR="scripts"
UNIT_TEST_PY="unit-test.py"
@@ -45,11 +43,6 @@
# Timestamp for job
echo "Unit test build started, $(date)"
-if [[ "${DISTRO}" == "fedora" ]]; then
- echo "Distro (${DISTRO}) not supported, running as ubuntu"
- DISTRO="ubuntu:latest"
-fi
-
# Check workspace, build scripts, and package to be unit tested exists
if [ ! -d "${WORKSPACE}" ]; then
echo "Workspace(${WORKSPACE}) doesn't exist, exiting..."
@@ -84,7 +77,6 @@
cd "${WORKSPACE}"/${OBMC_BUILD_SCRIPTS}
echo "Building docker image with build-unit-test-docker"
# Export input env variables
-export DISTRO
export BRANCH
export DOCKER_IMG_NAME=$(./scripts/build-unit-test-docker)