Fix virl ubuntu image + update ubuntu vpp builds

[csit.git] / resources / tools / disk-image-builder / ubuntu / run-listmaker.sh

diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
index 3b0a2e0..8fcf04c 100755 (executable)
--- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -62,9 +62,14 @@ echo "Storing data in ${OUTPUT_DIR}/."
 # APT packages wanted
 
 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 cmake"
-APT_WANTLIST_VPP="dkms bridge-utils"
+APT_WANTLIST_CSIT="python python-minimal python-dev python-pip python-virtualenv
+ python2.7 python2.7-minimal git strongswan socat python-cffi python3-cffi
+ python3 python3-cffi python3-cffi-backend python3-ply python3-pycparser
+ python-cffi-backend"
+APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev cmake tcpdump"
+APT_WANTLIST_VPP="dkms bridge-utils libmbedcrypto0 libmbedtls10 libmbedx509-0
+ libpython2.7-minimal libpython-stdlib libpython2.7-stdlib libc6
+ python-pycparser python-ply libssl1.0"
 APT_WANTLIST_TREX="zlib1g-dev unzip"
 APT_WANTLIST_NESTED="qemu-system-x86"
 APT_WANTLIST_JAVA="openjdk-8-jdk-headless"
@@ -130,9 +135,9 @@ do
 done
 echo "IP is $ip"
 
-sleep 10
+sleep 30
 
-if ping -w 60 -c 2 $ip > /dev/null
+if ping -w 60 -c 10 $ip > /dev/null
 then
   echo Host $ip alive
 else