Merge remote-tracking branch 'gerrit/master' into f/centos76
Change-Id: Ia6db918d0deabf2b9203f57e72500353650f747c Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
commit
eb6e03b078
|
@ -249,6 +249,15 @@ if [ "${CLEAN}" = "yes" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$TAG_LATEST" = "yes" ]; then
|
||||||
|
echo "Deleting image: ${IMAGE_NAME_LATEST}"
|
||||||
|
docker image rm ${IMAGE_NAME_LATEST}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed running docker image rm command" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ${BASE_IMAGE_PRESENT} -ne 0 ]; then
|
if [ ${BASE_IMAGE_PRESENT} -ne 0 ]; then
|
||||||
# The base image was not already present, so delete it
|
# The base image was not already present, so delete it
|
||||||
echo "Removing docker image ${OS}:${OS_VERSION}"
|
echo "Removing docker image ${OS}:${OS_VERSION}"
|
||||||
|
|
|
@ -2013,7 +2013,7 @@ echo "CMD_OPTIONS=$CMD_OPTIONS"
|
||||||
|
|
||||||
CMD="$CMD_PREFIX mockchain -r $BUILD_CFG -l $BUILD_BASE --recurse --log=$MOCKCHAIN_LOG --tmp_prefix=$USER --addrepo=$LOCAL_URL --addrepo=$LOCAL_SRC_URL -m --rootdir=$BUILD_BASE/mock/root $CMD_OPTIONS -m --rebuild $SRPMS_LIST"
|
CMD="$CMD_PREFIX mockchain -r $BUILD_CFG -l $BUILD_BASE --recurse --log=$MOCKCHAIN_LOG --tmp_prefix=$USER --addrepo=$LOCAL_URL --addrepo=$LOCAL_SRC_URL -m --rootdir=$BUILD_BASE/mock/root $CMD_OPTIONS -m --rebuild $SRPMS_LIST"
|
||||||
echo "$CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'"
|
echo "$CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'"
|
||||||
trapwrap stdbuf -o0 $CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'
|
trapwrap stdbuf -o0 $CMD -m --define='_tis_dist .tis' -m --define="platform_release $PLATFORM_RELEASE"
|
||||||
MOCKCHAIN_RC=$?
|
MOCKCHAIN_RC=$?
|
||||||
|
|
||||||
echo $PLATFORM_RELEASE > $LAST_PLATFORM_RELEASE_FILE
|
echo $PLATFORM_RELEASE > $LAST_PLATFORM_RELEASE_FILE
|
||||||
|
|
Loading…
Reference in New Issue