diff options
| -rwxr-xr-x | bootstrap.sh | 2 | ||||
| -rw-r--r-- | resources/tools/disk-image-builder/ubuntu/CHANGELOG | 4 | ||||
| -rwxr-xr-x | resources/tools/disk-image-builder/ubuntu/build-listmaker.sh | 4 | ||||
| -rwxr-xr-x | resources/tools/disk-image-builder/ubuntu/build.sh | 2 | ||||
| -rwxr-xr-x | resources/tools/disk-image-builder/ubuntu/run-listmaker.sh | 7 |
5 files changed, 12 insertions, 7 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 56cfbe2e15..f3564ecc23 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -29,7 +29,7 @@ VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" VIRL_TOPOLOGY=double-ring-nested.xenial -VIRL_RELEASE=csit-ubuntu-16.04.1_2016-10-10_1.4 +VIRL_RELEASE=csit-ubuntu-16.04.1_2016-11-28_1.5 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" diff --git a/resources/tools/disk-image-builder/ubuntu/CHANGELOG b/resources/tools/disk-image-builder/ubuntu/CHANGELOG index b178357b7d..d8b0a2b4a8 100644 --- a/resources/tools/disk-image-builder/ubuntu/CHANGELOG +++ b/resources/tools/disk-image-builder/ubuntu/CHANGELOG @@ -1,3 +1,7 @@ +## [1.5] - 2016-11-28 + +Add libpcap-dev and libpcap0.8-dev + ## [1.4] - 2016-10-07 Ubuntu 16.04.1 diff --git a/resources/tools/disk-image-builder/ubuntu/build-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/build-listmaker.sh index 511499512c..91c952ff05 100755 --- a/resources/tools/disk-image-builder/ubuntu/build-listmaker.sh +++ b/resources/tools/disk-image-builder/ubuntu/build-listmaker.sh @@ -20,11 +20,11 @@ BUILD_DIR="$(pwd)/build" PACKER_DIR="${BUILD_DIR}/packer" OUT_DIR="${BUILD_DIR}/output/listmaker" -if [ "$1" == "ubuntu-14.04.4" ] +if [ "$1" = "ubuntu-14.04.4" ] then RELEASE_NAME="csit-ubuntu-14.04.4-listmaker" PACKER_TEMPLATE="listmaker/ubuntu-14.04.4.json" -elif [ "$1" == "ubuntu-16.04.1" ] +elif [ "$1" = "ubuntu-16.04.1" ] then RELEASE_NAME="csit-ubuntu-16.04.1-listmaker" PACKER_TEMPLATE="listmaker/ubuntu-16.04.1.json" diff --git a/resources/tools/disk-image-builder/ubuntu/build.sh b/resources/tools/disk-image-builder/ubuntu/build.sh index 2b953f1c3a..6b1254661d 100755 --- a/resources/tools/disk-image-builder/ubuntu/build.sh +++ b/resources/tools/disk-image-builder/ubuntu/build.sh @@ -83,7 +83,7 @@ PACKER_DIR="${BUILD_DIR}/packer" APT_CACHE_DIR="${BUILD_DIR}/cache/apt" PIP_CACHE_DIR="${BUILD_DIR}/cache/pip" -PACKER_TEMPLATE="ubuntu-14.04.4.json" +PACKER_TEMPLATE="$1.json" LISTS_DIR="$(dirname $0)/lists" function syntax { diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh index 129e2d49fc..00ee77415e 100755 --- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh +++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh @@ -38,11 +38,11 @@ then fi DATE=$(date +%Y-%m-%d) -if [ "$1" == "ubuntu-14.04.4" ] +if [ "$1" = "ubuntu-14.04.4" ] then OS="ubuntu-14.04.4" VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-14.04.4.yaml" -elif [ "$1" == "ubuntu-16.04.1" ] +elif [ "$1" = "ubuntu-16.04.1" ] then OS="ubuntu-16.04.1" VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-16.04.1.yaml" @@ -63,6 +63,7 @@ echo "Storing data in ${OUTPUT_DIR}/." APT_WANTLIST_INFRA="nfs-common cloud-init" APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan" +APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev" APT_WANTLIST_VPP="dkms bridge-utils" APT_WANTLIST_TREX="zlib1g-dev unzip" APT_WANTLIST_NESTED="qemu-system-x86" @@ -72,7 +73,7 @@ APT_WANTLIST_JAVA="openjdk-8-jdk-headless" # For now, let us NOT incude WANTLIST_NESTED in the below. We're installing qemu # separately from a separate source. -APT_WANTLIST="$APT_WANTLIST_INFRA $APT_WANTLIST_CSIT $APT_WANTLIST_VPP $WANTLIST_TREX" +APT_WANTLIST="$APT_WANTLIST_INFRA $APT_WANTLIST_CSIT $APT_WANTLIST_VPP $APT_WANTLIST_TREX $APT_WANTLIST_TLDK" APT_OUTPUTFILE="${OUTPUT_DIR}/apt-packages.txt" |