X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbenchvm%2Fdib%2Fbuild-image.sh;h=445807b1f8084d98e9c375393429582943400dec;hb=refs%2Fchanges%2F34%2F73234%2F1;hp=4559bb63d70ff27d1f2133f18f75bd6d5ac2a3dc;hpb=1a9c875d35daf4e742cd980e824c862ad793a658;p=nfvbench.git

diff --git a/nfvbenchvm/dib/build-image.sh b/nfvbenchvm/dib/build-image.sh
index 4559bb6..445807b 100755
--- a/nfvbenchvm/dib/build-image.sh
+++ b/nfvbenchvm/dib/build-image.sh
@@ -6,37 +6,68 @@
 # Ubuntu: sudo apt-get -y install python3 python3-venv qemu-utils kpartx
 # CentOS: sudo yum install -y python3 qemu-img kpartx
 
-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
-}
+# Stop on error (see https://wizardzines.com/comics/bash-errors/)
+set -euo pipefail
 
+DEBUG=no
 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
 # ----------------------------------------------------------------------------
 
-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
     case $opt in
-        h)
-            usage
-            exit 0
+        l)
+            loopvm_only=1
             ;;
         g)
             generator_only=1
             ;;
-        l)
-            loopvm_only=1
-            ;;
         v)
             verify_only=1
             ;;
+        t)
+            set -x
+            export DIB_DEBUG_TRACE=1
+            ;;
+        d)
+            DEBUG=yes
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
         ?)
             usage
             exit 1
@@ -44,15 +75,10 @@ while getopts ":hglv" opt; do
     esac
 done
 
-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
@@ -73,7 +99,6 @@ function build_image {
     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
@@ -114,6 +139,13 @@ function build_image {
         # 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
@@ -136,6 +168,10 @@ function build_image {
 }
 
 
+# ----------------------------------------------------------------------------
+# Main program
+# ----------------------------------------------------------------------------
+
 if [ ! $generator_only -eq 1 ] && [ ! $loopvm_only -eq 1 ]; then
    echo "Build loop VM image"
    build_image $loopvm_image_name