X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbenchvm%2Fdib%2Fbuild-image.sh;h=8ee9bf334d7d238640fe21cb98a502910efb440b;hb=415d892039c4dc75a0b7fe6158268dfb0169ce7b;hp=c595f6b123d24ec1fbc20df89e5494741967252d;hpb=424d660b5355205afeb736163d3e6cf140e9b9f1;p=nfvbench.git diff --git a/nfvbenchvm/dib/build-image.sh b/nfvbenchvm/dib/build-image.sh index c595f6b..8ee9bf3 100755 --- a/nfvbenchvm/dib/build-image.sh +++ b/nfvbenchvm/dib/build-image.sh @@ -3,39 +3,79 @@ # A shell script to build the VPP VM image or NFVbench+TRex VM image using diskinage-builder # # The following packages must be installed prior to using this script: -# sudo apt-get -y install python-virtualenv qemu-utils kpartx +# 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 +build_generator=0 +build_loopvm=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__ + +# Default values for nfvbenchvm dib element variables +export DIB_NFVBENCH_CODE_ORIGIN=opnfv-gerrit + + # ---------------------------------------------------------------------------- # Parse command line options and configure the script # ---------------------------------------------------------------------------- -while getopts ":hglv" opt; do +usage() { + cat </dev/null; then - if gsutil -q stat gs://$gs_url/$1.qcow2; then - gsutil rm http://$gs_url/$1.qcow2 - echo "Image is deleted" - exit 0 - fi - echo "Image does not exist in google storage, starting build..." - echo - else - echo "Cannot check image availability in OPNFV artifact repository (gsutil not available)" - fi +function copy_local_nfvbench_code_to_static_dir { + echo "Copy local nfvbench code to elements/nfvbenchvm/static/opt" + # Create elements/nfvbenchvm/static/opt/ directory if it does not exist and + # move there + pushd $(dirname $0)/elements/nfvbenchvm/static + [ -d opt ] || mkdir opt + cd opt + + # Remove nfvbench code if it is already there + [ -d nfvbench ] && rm -rf nfvbench + + # Use git to "copy" the local nfvbench code. + # This will include all the committed changes of the current branch. + git clone ../../../../../.. nfvbench + + # Go back to the current directory when this function was called + popd } +# ---------------------------------------------------------------------------- +# Configure and start the nfvbenchvm image build +# ---------------------------------------------------------------------------- + function build_image { # if image exists skip building echo "Checking if image exists in google storage..." if command -v gsutil >/dev/null; then - if gsutil -q stat gs://$gs_url/$1.qcow2; then - echo "Image already exists at http://$gs_url/$1.qcow2" - echo "Build is skipped" - exit 0 - fi - echo "Image does not exist in google storage, starting build..." - echo + if gsutil -q stat gs://$gs_url/$1.qcow2; then + echo "Image already exists at http://$gs_url/$1.qcow2" + echo "Build is skipped" + exit 0 + fi + echo "Image does not exist in google storage, starting build..." + echo else - echo "Cannot check image availability in OPNFV artifact repository (gsutil not available)" + echo "Cannot check image availability in OPNFV artifact repository (gsutil not available)" fi # check if image is already built locally 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 else - virtualenv dib-venv + python3 -m venv dib-venv . dib-venv/bin/activate - pip install diskimage-builder + pip install diskimage-builder==3.16.0 fi # Add nfvbenchvm_centos elements directory to the DIB elements path @@ -129,8 +180,18 @@ function build_image { export TREX_VER=$(awk '/ENV TREX_VER/ {print $3}' ../../docker/Dockerfile | sed 's/"//g' | sed 's/\r//g') fi + # 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 centos7 nfvbenchvm + time disk-image-create -o $1 centos nfvbenchvm fi ls -l $1.qcow2 @@ -151,22 +212,35 @@ function build_image { } -if [ ! $generator_only -eq 1 ] && [ ! $loopvm_only -eq 1 ]; then - echo "cleanup old loop VM image (wrong content)" - cleanup_image $loopvm_image_name - echo "Build loop VM image" - build_image $loopvm_image_name - echo "cleanup old generator VM image (wrong content)" - cleanup_image $generator_image_name - echo "Build generator image" - build_image $generator_image_name -else - if [ $loopvm_only -eq 1 ]; then - echo "Build loop VM image" - build_image $loopvm_image_name - fi - if [ $generator_only -eq 1 ]; then - echo "Build generator image" - build_image $generator_image_name +# ---------------------------------------------------------------------------- +# Main program +# ---------------------------------------------------------------------------- + +if [ $build_loopvm -eq 1 ]; then + echo "Build loop VM image" + build_image $loopvm_image_name +fi + +if [ $build_generator -eq 1 ]; then + echo "Build generator image" + + if [[ "${DIB_NFVBENCH_CODE_ORIGIN}" == "static" ]]; then + echo "Use local nfvbench code" + copy_local_nfvbench_code_to_static_dir + + # Append nfvbench version number to the image name: + # during development, this is useful to distinguish the development + # images from the latest published image. + # + # To avoid confusion, we use the same versioning as nfvbench (see + # nfvbench/__init__.py), although "git describe" would give us a better + # number with respect to uniqueness. So we will typically get something + # like "5.0.4.dev31" where "5.0.4" is the latest annotated tag ("5.0.3") + # plus one and where dev31 indicates the number of commits (31) since + # that tag. + nfvbench_version=$(python -c 'import pbr.version; print(pbr.version.VersionInfo("nfvbench").version_string_with_vcs())') + generator_image_name="${generator_image_name}-${nfvbench_version}" fi -fi \ No newline at end of file + + build_image $generator_image_name +fi