updating vm creation for virt deployment

- replacing brbm with logical names br-netname
- replacing instack-virt-setup with tripleo scripts

JIRA: APEX-90, APEX-80

Change-Id: I58a15dee8de882e034c8af8a3368ca0647741b13
Signed-off-by: Dan Radez <dradez@redhat.com>

1 files changed, 80 insertions, 378 deletions

diff --git a/ci/build.sh b/ci/build.sh
index 82d5b637..b5bfc8ca 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,411 +1,113 @@
-#!/bin/bash
-set -e
+#!/bin/sh
 ##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# dradez@redhat.com
+# Copyright (c) 2016 Dan Radez (Red Hat) and others.
+#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-trap 'echo "Exiting ..."; \
-if [ -f ${LOCK_FILE} ]; then \
-   if [ $(cat ${LOCK_FILE}) -eq $$ ]; then \
-      rm -f ${LOCK_FILE}; \
-   fi; \
-fi;' EXIT
+set -e
 
-############################################################################
-# BEGIN of usage description
-#
-usage ()
+display_usage ()
 {
 cat << EOF
 $0 Builds the Apex OPNFV Deployment Toolchain
 
-usage: $0 [-s spec-file] [-c cache-URI] [-l log-file] [-f Flags] build-directory
+usage: $0 [ -c cache_dir ] -r release_name [ --iso | --rpms ]
 
 OPTIONS:
-  -s spec-file ($BUILD_SPEC), define the build-spec file, default ../build/config.mk
-  -c cache base URI ($BUILD_CACHE_URI), specifies the base URI to a build cache to be used/updated - the name is automatically generated from the md5sum of the spec-file, http://, ftp://, file://[absolute path] suported.
-
-  -l log-file ($BUILD_LOG), specifies the output log-file (stdout and stderr), if not specified logs are output to console as normal
-  -v version tag to be applied to the build result
-  -r alternative remote access method script/program. curl is default.
-  -t run small build-script unit test.
-  -T run large build-script unit test.
-  -f build flags ($BUILD_FLAGS):
-     o s: Do nothing, succeed
-     o f: Do nothing, fail
-     o t: run build unit tests
-     o M: Use master branch code
-     o i: run interactive (-t flag to docker run)
-     o P: Populate a new local cache and push it to the (-c cache-URI) cache artifactory if -c option is present, currently file://, http:// and ftp:// are supported
-     o d: Detatch - NOT YET SUPPORTED
-
-  build-directory ($BUILD_DIR), specifies the directory for the output artifacts (.iso file).
-
+  -c cache destination - directory of cached files, defaults to ./cache
+  -r release name/version of the build result
+  --iso build the iso (implies RPMs too)
+  --rpms build the rpms
+  --debug enable debug
   -h help, prints this help text
 
-Description:
-build.sh builds opnfv .iso artifact.
-To reduce build time it uses build cache on a local or remote location. The cache is rebuilt and uploaded if either of the below conditions are met:
-1) The P(opulate) flag is set and the -c cache-base-URI is provided, if -c is not provided the cache will stay local.
-2) If the cache is invalidated by one of the following conditions:
-   - The config spec md5sum does not compare to the md5sum for the spec which the cache was built.
-   - The git Commit-Id on the remote repos/HEAD defined in the spec file does not correspont with the Commit-Id for what the cache was built with.
-3) A valid cache does not exist on the specified -c cache-base-URI.
-
-The cache URI object name is apex_cache-"md5sum(spec file)"
-
-Logging by default to console, but can be directed elsewhere with the -l option in which case both stdout and stderr is redirected to that destination.
-
-Built in unit testing of components is enabled by adding the t(est) flag.
-
-Return codes:
- - 0 Success!
- - 1-99 Unspecified build error
- - 100-199 Build system internal error (not build it self)
-   o 101 Build system instance busy
- - 200 Build failure
-
-Examples:
-build -c http://opnfv.org/artifactory/apex/cache -d ~/jenkins/genesis/apex/ci/output -f ti
-NOTE: At current the build scope is set to the git root of the repository, -d destination locations outside that scope will not work
+Example:
+build -c file:///tmp/cache -r dev123
 EOF
 }
-#
-# END of usage description
-############################################################################
 
-############################################################################
-# BEGIN of variables to customize
-#
 BUILD_BASE=$(readlink -e ../build/)
-RESULT_DIR="${BUILD_BASE}/release"
-BUILD_SPEC="${BUILD_BASE}/config.mk"
+CACHE_DEST=""
 CACHE_DIR="cache"
-LOCAL_CACHE_ARCH_NAME="apex-cache"
-REMOTE_CACHE_ARCH_NAME="apex_cache-$(md5sum ${BUILD_SPEC}| cut -f1 -d " ")"
-REMOTE_ACCESS_METHD=curl
-INCLUDE_DIR=../include
-#
-# END of variables to customize
-############################################################################
-
-############################################################################
-# BEGIN of script assigned variables
-#
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-LOCK_FILE="${SCRIPT_DIR}/.build.lck"
-CACHE_TMP="${SCRIPT_DIR}/tmp"
-TEST_SUCCEED=0
-TEST_FAIL=0
-UNIT_TEST=0
-USE_MASTER=0
-UPDATE_CACHE=0
-POPULATE_CACHE=0
-RECURSIV=0
-DETACH=0
-DEBUG=0
-INTEGRATION_TEST=0
-FULL_INTEGRATION_TEST=0
-INTERACTIVE=0
-BUILD_CACHE_URI=
-BUILD_SPEC=
-BUILD_DIR=
-BUILD_LOG=
-BUILD_VERSION=
-MAKE_ARGS=
-#
-# END of script assigned variables
-############################################################################
-
-############################################################################
-# BEGIN of include pragmas
-#
-source ${INCLUDE_DIR}/build.sh.debug
-#
-# END of include
-############################################################################
-
-############################################################################
-# BEGIN of main
-#
-while getopts "s:c:d:v:f:l:r:RtTh" OPTION
-do
-    case $OPTION in
-	h)
-	    usage
-	    rc=0
-	    exit $rc
-	    ;;
-
-	s)
-	    BUILD_SPEC=${OPTARG}
-	    ;;
-
-	c)
-	    BUILD_CACHE_URI=${OPTARG}
-	    ;;
-
-	d)
-	    BUILD_DIR=${OPTARG}
-	    ;;
-
-	l)
-	    BUILD_LOG=${OPTARG}
-	    ;;
-
-	v)
-	    BUILD_VERSION=${OPTARG}
-	    ;;
-
-	f)
-	    BUILD_FLAGS=${OPTARG}
-	    ;;
-
-	r)  REMOTE_ACCESS_METHD=${OPTARG}
-	    ;;
-
-	R)
-	    RECURSIVE=1
-	    ;;
-
-	t)
-	    INTEGRATION_TEST=1
-	    ;;
-
-	T)
-	    INTEGRATION_TEST=1
-	    FULL_INTEGRATION_TEST=1
-	    ;;
-
-	*)
-	    echo "${OPTION} is not a valid argument"
-	    rc=100
-	    exit $rc
-	    ;;
+CACHE_NAME="apex-cache"
+MAKE_TARGET="images"
+
+parse_cmdline() {
+  while [ "${1:0:1}" = "-" ]
+  do
+    case "$1" in
+        -h|--help)
+                display_usage
+                exit 0
+            ;;
+        -c|--cache-dir)
+                CACHE_DEST=${2}
+                shift 2
+            ;;
+        -r|--release)
+                RELEASE=${2}
+                shift 2
+            ;;
+        --iso )
+                MAKE_TARGET="iso"
+                echo "Building opnfv-apex RPMs and ISO"
+                shift 1
+            ;;
+        --rpms )
+                MAKE_TARGET="rpms"
+                echo "Buiding opnfv-apex RPMs"
+                shift 1
+            ;;
+        --debug )
+                debug="TRUE"
+                echo "Enable debug output"
+                shift 1
+            ;;
+        *)
+                display_usage
+                exit 1
+            ;;
     esac
-done
-
-if [ -z $BUILD_DIR ]; then
-    BUILD_DIR=$(echo $@ | cut -d ' ' -f ${OPTIND})
-fi
-
-for ((i=0; i<${#BUILD_FLAGS};i++)); do
-    case ${BUILD_FLAGS:$i:1} in
-	s)
-	    rc=0
-	    exit $rc
-	    ;;
-
-	f)
-	    rc=1
-	    exit $rc
-	    ;;
-
-	t)
-	    UNIT_TEST=1
-	    ;;
-
-	M)
-	    USE_MASTER=1
-	    ;;
+  done
 
-	i)
-	    INTERACTIVE=1
-	    ;;
-
-	P)
-	    POPULATE_CACHE=1
-	    ;;
-
-	d)
-	    DETACH=1
-	    echo "Detach is not yet supported - exiting ...."
-	    rc=100
-	    exit $rc
-	    ;;
-
-	D)
- 	    DEBUG=1
-	    ;;
-
-	*)
-	    echo "${BUILD_FLAGS:$i:1} is not a valid build flag - exiting ...."
-	    rc=100
-	    exit $rc
-	    ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-if [ ${INTEGRATION_TEST} -eq 1 ]; then
-    integration-test
-    rc=0
-    exit $rc
-fi
-
-if [ ! -f ${BUILD_SPEC} ]; then
-    echo "spec file does not exist: $BUILD_SPEC - exiting ...."
-    rc=100
-    exit $rc
-fi
-
-if [ -z ${BUILD_DIR} ]; then
-    echo "Missing build directory - exiting ...."
-    rc=100
-    exit $rc
-fi
-
-if [ ! -z ${BUILD_LOG} ]; then
-    if [[ ${RECURSIVE} -ne 1 ]]; then
-	set +e
-	eval $0 -R $@ > ${BUILD_LOG} 2>&1
-	rc=$?
-	set -e
-	if [ $rc -ne 0]; then
-	    exit $rc
-	fi
-    fi
-fi
-
-if [ ${TEST_SUCCEED} -eq 1 ]; then
-    sleep 1
-    rc=0
-    exit $rc
-fi
-
-if [ ${TEST_FAIL} -eq 1 ]; then
-    sleep 1
-    rc=1
-    exit $rc
-fi
-
-if [ -e ${LOCK_FILE} ]; then
-    echo "A build job is already running, exiting....."
-    rc=101
-    exit $rc
-fi
-
-echo $$ > ${LOCK_FILE}
+}
 
-if [ ! -z ${BUILD_CACHE_URI} ]; then
-    if [ ${POPULATE_CACHE} -ne 1 ]; then
-	rm -rf ${CACHE_TMP}/cache
-	mkdir -p ${CACHE_TMP}/cache
-	echo "Downloading cach file ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME} ..."
-	set +e
-	${REMOTE_ACCESS_METHD} -o ${CACHE_TMP}/cache/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz
-	rc=$?
-	set -e
-	if [ $rc -ne 0 ]; then
-		echo "Remote cache does not exist, or is not accessible - a new cache will be built ..."
-		POPULATE_CACHE=1
-	else
-	    echo "Unpacking cache file ..."
-	    tar --atime-preserve -C ${CACHE_TMP}/cache -xvf ${CACHE_TMP}/cache/${LOCAL_CACHE_ARCH_NAME}.tgz
-	    cp ${CACHE_TMP}/cache/cache/.versions ${BUILD_BASE}/.
-	    set +e
-       	    make -C ${BUILD_BASE} validate-cache;
-	    rc=$?
-	    set -e
+parse_cmdline "$@"
 
-	    if [ $rc -ne 0 ]; then
-		echo "Cache invalid - a new cache will be built "
-		POPULATE_CACHE=1
-	    else
-		cp -rf ${CACHE_TMP}/cache/cache/. ${BUILD_BASE}
-	    fi
-	    rm -rf ${CACHE_TMP}/cache
-	fi
-    fi
-fi
+if [ -n "$RELEASE" ]; then MAKE_ARGS+="RELEASE=$RELEASE "; fi
 
-if [ ${POPULATE_CACHE} -eq 1 ]; then
-    if [ ${DEBUG} -eq 0 ]; then
-	set +e
-	cd ${BUILD_BASE} && make clean
-	rc=$?
-	set -e
-	if [ $rc -ne 0 ]; then
-	    echo "Build - make clean failed, exiting ..."
-	    rc=100
-	    exit $rc
-	fi
+# Get the Old Cache
+if [ -n "$CACHE_DEST" ]; then
+    echo "Retrieving Cache"
+    if [ -f $CACHE_DEST/${CACHE_NAME}.tgz ]; then
+        rm -rf $BUILD_BASE/$CACHE_DIR
+        cp -f $CACHE_DEST/${CACHE_NAME}.tgz $BUILD_BASE/${CACHE_NAME}.tgz
+        tar xzf $BUILD_BASE/${CACHE_NAME}.tgz
+    elif [ ! -d $BUILD_BASE/$CACHE_DIR ]; then
+        mkdir $BUILD_BASE/$CACHE_DIR
     fi
 fi
 
-if [ ! -z ${BUILD_VERSION} ]; then
-    MAKE_ARGS+="REVSTATE=${BUILD_VERSION} "
+#create build_output for legecy functionality compatibiltiy in jenkins
+if [[ ! -d ../build_output  ]]; then
+    rm -f ../build_output
+    ln -s build/noarch/ ../build_output
 fi
 
-if [ ${UNIT_TEST} -eq 1 ]; then
-    MAKE_ARGS+="UNIT_TEST=TRUE "
-else
-    MAKE_ARGS+="UNIT_TEST=FALSE "
-fi
-
-if [ ${USE_MASTER} -eq 1 ]; then
-    MAKE_ARGS+="USE_MASTER=-master "
-fi
+# Execute Make
+make $MAKE_ARGS -C ${BUILD_BASE} $MAKE_TARGET
+echo "Build Complete"
 
-if [ ${INTERACTIVE} -eq 1 ]; then
-    MAKE_ARGS+="INTERACTIVE=TRUE "
-else
-    MAKE_ARGS+="INTERACTIVE=FALSE "
+# Build new Cache
+if [ -n "$CACHE_DEST" ]; then
+    echo "Building Cache"
+    tar --atime-preserve --dereference -C $BUILD_BASE -caf $BUILD_BASE/${CACHE_NAME}.tgz $CACHE_DIR
+    echo "Copying Cache"
+    if [ ! -d $CACHE_DEST ]; then mkdir -p $CACHE_DEST; fi
+    cp $BUILD_BASE/${CACHE_NAME}.tgz $CACHE_DEST/${CACHE_NAME}.tgz
 fi
-
-MAKE_ARGS+=all
-
-if [ ${DEBUG} -eq 0 ]; then
-    set +e
-    cd ${BUILD_BASE} && make ${MAKE_ARGS}
-    rc=$?
-    set -e
-    if [ $rc -gt 0 ]; then
-	echo "Build: make all failed, exiting ..."
-	rc=200
-	exit $rc
-    fi
-else
-debug_make
-fi
-set +e
-make -C ${BUILD_BASE} prepare-cache
-rc=$?
-set -e
-
-if [ $rc -gt 0 ]; then
-    echo "Build: make prepare-cache failed - exiting ..."
-    rc=100
-    exit $rc
-fi
-echo "Linking built OPNFV .iso file to target directory ${BUILD_DIR} ..."
-rm -rf ${BUILD_DIR}
-mkdir -p ${BUILD_DIR}
-ln -s ${BUILD_BASE}/.versions ${BUILD_DIR}
-ln -s ${RESULT_DIR}/*.iso* ${BUILD_DIR}
-echo "Linking built OPNFV .rpm files to target directory ${BUILD_DIR} ..."
-ln -s ${BUILD_BASE}/*.rpm ${BUILD_DIR}
-ln -s ${BUILD_BASE}/noarch/*.rpm ${BUILD_DIR}
-
-if [ $POPULATE_CACHE -eq 1 ]; then
-    if [ ! -z ${BUILD_CACHE_URI} ]; then
-	echo "Building cache ..."
-	tar --atime-preserve --dereference -C ${BUILD_BASE} -caf ${BUILD_BASE}/${LOCAL_CACHE_ARCH_NAME}.tgz ${CACHE_DIR}
-	echo "Uploading cache ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}"
-	${REMOTE_ACCESS_METHD} -T ${BUILD_BASE}/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz
-	rm ${BUILD_BASE}/${LOCAL_CACHE_ARCH_NAME}.tgz
-    fi
-fi
-echo "Success!!!"
-exit 0
-#
-# END of main
-############################################################################
+echo "Complete"