- The new option -t (enable debug traces) allows to show in the build
log the commands run in the shell scripts, including the commands
defined in the disk image builder elements.
- The new option -d (debug) instructs disk-image-create to drop the
developer in a shell inside the chroot in case an error occurs. This
makes troubleshooting of the image possible (inspect files, run
commands, ...)
Change-Id: I5f76e7dec64fc4c86b1515f6b81a16e11e03eadf
Signed-off-by: Gwenael Lambrouin <gwenael.lambrouin@orange.com>
# Stop on error (see https://wizardzines.com/comics/bash-errors/)
set -euo pipefail
# Stop on error (see https://wizardzines.com/comics/bash-errors/)
set -euo pipefail
-usage() {
- echo "Usage: $0 [-l] [-g] [-v]"
- echo " -l build NFVbench loop VM image"
- echo " -g build NFVbench generator image"
- echo " -v verify only (build but do not push to google storage)"
- exit 1
-}
-
verify_only=0
generator_only=0
loopvm_only=0
__prefix__=""
verify_only=0
generator_only=0
loopvm_only=0
__prefix__=""
+
+# Artifact URL
+gs_url=artifacts.opnfv.org/nfvbench/images
+
+# image version number
+__version__=0.15
+loopvm_image_name=nfvbenchvm_centos-$__version__
+generator_image_name=nfvbenchvm_centos-generator-$__version__
+
+
# ----------------------------------------------------------------------------
# Parse command line options and configure the script
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Parse command line options and configure the script
# ----------------------------------------------------------------------------
-while getopts ":hglv" opt; do
+usage() {
+ cat <<EOF
+$(basename $0) - build NFVbench VM images
+Usage:
+ $(basename $0) [OPTIONS]
+
+OPTIONS
+ -l: build NFVbench loop VM image
+ -g: build NFVbench generator image
+ -v: verify only (build but do not push to google storage)
+
+ -t: enable debug trace (set -x + DIB_DEBUG_TRACE=1)
+ -d: start debug shell in image chroot in case of build error
+ -h: show this help message
+EOF
+ exit 1
+}
+
+while getopts ":lgvtdh" opt; do
;;
g)
generator_only=1
;;
;;
g)
generator_only=1
;;
- l)
- loopvm_only=1
- ;;
+ t)
+ set -x
+ export DIB_DEBUG_TRACE=1
+ ;;
+ d)
+ DEBUG=yes
+ ;;
+ h)
+ usage
+ exit 0
+ ;;
-set -e
-
-# Artifact URL
-gs_url=artifacts.opnfv.org/nfvbench/images
-# image version number
-__version__=0.15
-loopvm_image_name=nfvbenchvm_centos-$__version__
-generator_image_name=nfvbenchvm_centos-generator-$__version__
+# ----------------------------------------------------------------------------
+# Configure and start the nfvbenchvm image build
+# ----------------------------------------------------------------------------
function build_image {
# if image exists skip building
function build_image {
# if image exists skip building
if [ -f $1.qcow2 ]; then
echo "Image $1.qcow2 already exists locally"
else
if [ -f $1.qcow2 ]; then
echo "Image $1.qcow2 already exists locally"
else
# install diskimage-builder
if [ -d dib-venv ]; then
. dib-venv/bin/activate
# install diskimage-builder
if [ -d dib-venv ]; then
. dib-venv/bin/activate
# Specify CentOS version
export DIB_RELEASE=7
# Specify CentOS version
export DIB_RELEASE=7
+ # Debug on error: if an error occurs during the build, disk-image-create
+ # will drop us in a Bash inside the chroot, and we will be able to inspect
+ # the current state of the image.
+ if [[ "${DEBUG}" == "yes" ]]; then
+ export break=after-error
+ fi
+
echo "Building $1.qcow2..."
time disk-image-create -o $1 centos nfvbenchvm
fi
echo "Building $1.qcow2..."
time disk-image-create -o $1 centos nfvbenchvm
fi
+# ----------------------------------------------------------------------------
+# Main program
+# ----------------------------------------------------------------------------
+
if [ ! $generator_only -eq 1 ] && [ ! $loopvm_only -eq 1 ]; then
echo "Build loop VM image"
build_image $loopvm_image_name
if [ ! $generator_only -eq 1 ] && [ ! $loopvm_only -eq 1 ]; then
echo "Build loop VM image"
build_image $loopvm_image_name
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Make sure the disk image build fails if nfvbench installation fails
set -euo pipefail
# Make sure the disk image build fails if nfvbench installation fails
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+ set -x
+fi
+
# Stop on error
set -euo pipefail
# Stop on error
set -euo pipefail