summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
fa74b0c)
- Add libpcap-dev packages to VIRL image
- Small fixes
Change-Id: I111b0d7e89180ffb7efa76c6503e687f715367f8
Signed-off-by: pmikus <pmikus@cisco.com>
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_TOPOLOGY=double-ring-nested.xenial
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"
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
+## [1.5] - 2016-11-28
+
+Add libpcap-dev and libpcap0.8-dev
+
## [1.4] - 2016-10-07
Ubuntu 16.04.1
## [1.4] - 2016-10-07
Ubuntu 16.04.1
PACKER_DIR="${BUILD_DIR}/packer"
OUT_DIR="${BUILD_DIR}/output/listmaker"
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"
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"
then
RELEASE_NAME="csit-ubuntu-16.04.1-listmaker"
PACKER_TEMPLATE="listmaker/ubuntu-16.04.1.json"
APT_CACHE_DIR="${BUILD_DIR}/cache/apt"
PIP_CACHE_DIR="${BUILD_DIR}/cache/pip"
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 {
LISTS_DIR="$(dirname $0)/lists"
function syntax {
fi
DATE=$(date +%Y-%m-%d)
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"
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"
then
OS="ubuntu-16.04.1"
VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-16.04.1.yaml"
APT_WANTLIST_INFRA="nfs-common cloud-init"
APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan"
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"
APT_WANTLIST_VPP="dkms bridge-utils"
APT_WANTLIST_TREX="zlib1g-dev unzip"
APT_WANTLIST_NESTED="qemu-system-x86"
# For now, let us NOT incude WANTLIST_NESTED in the below. We're installing qemu
# separately from a separate source.
# 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"
APT_OUTPUTFILE="${OUTPUT_DIR}/apt-packages.txt"