From b417beabd253e93d494075f7474343e8c3ac3f34 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 14 Nov 2018 09:14:05 +0000
Subject: Adding python-cffi requirements

- Introduce Ubuntu 18.04.5 VIRL image
- FIX mac addresses for dhcp
- Add ansible task for python-cffi install on perf testbeds

Change-Id: I8acfcdc8ee97c13ad4795a4ccde868a96b3fee47
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 .../tools/disk-image-builder/centos/CHANGELOG      |  4 ++
 .../pip-requirements.txt                           | 15 ++++++
 .../rpm-packages.txt                               | 62 ++++++++++++++++++++++
 .../disk-image-builder/centos/run-listmaker.sh     |  5 +-
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/pip-requirements.txt
 create mode 100644 resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/rpm-packages.txt

(limited to 'resources/tools/disk-image-builder/centos')

diff --git a/resources/tools/disk-image-builder/centos/CHANGELOG b/resources/tools/disk-image-builder/centos/CHANGELOG
index d9bedc04c9..0d8aadda4b 100644
--- a/resources/tools/disk-image-builder/centos/CHANGELOG
+++ b/resources/tools/disk-image-builder/centos/CHANGELOG
@@ -1,3 +1,7 @@
+## [2.0] - 2018-11-19
+
+Add python-cffi.
+
 ## [1.9] - 2018-03-20
 
 Centos image 7.4-1711 Add mbedtls and selinux-policy.
diff --git a/resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/pip-requirements.txt b/resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/pip-requirements.txt
new file mode 100644
index 0000000000..e0d4c1cfa6
--- /dev/null
+++ b/resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/pip-requirements.txt
@@ -0,0 +1,15 @@
+docopt==0.6.2
+ecdsa==0.13
+enum34==1.1.2
+interruptingcow==0.6
+ipaddress==1.0.16
+paramiko==1.16.0
+pycrypto==2.6.1
+pykwalify==1.5.0
+pypcap==1.1.5
+python-dateutil==2.4.2
+PyYAML==3.11
+requests==2.9.1
+robotframework==2.9.2
+scapy==2.3.1
+scp==0.10.2
diff --git a/resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/rpm-packages.txt b/resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/rpm-packages.txt
new file mode 100644
index 0000000000..7c3084978b
--- /dev/null
+++ b/resources/tools/disk-image-builder/centos/lists/centos-7.4-1711_2018-11-19_2.0/rpm-packages.txt
@@ -0,0 +1,62 @@
+bridge-utils
+cloud-init
+dkms-2.6.1-1.el7.noarch http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/d/
+elfutils-libelf
+elfutils-libelf-devel
+gcc
+git
+glusterfs
+glusterfs-api
+glusterfs-devel
+gnutls
+gperftools
+ipxe-roms-qemu
+java-1.8.0-openjdk-devel
+java-1.8.0-openjdk-headless
+kernel-debug-devel
+libcacard
+libcacard-devel
+libcacard-tools
+libffi-devel
+libibverbs
+libiscsi
+libpcap
+libpcap-devel
+libpng
+librados2
+librbd1
+librdmacm
+libseccomp
+libusb
+mbedtls-2.7.6-1.el7.x86_64 http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/
+nettle-2.7.1-8.el7.x86_64 http://mirror.centos.org/centos/7/os/x86_64/Packages/
+nfs-utils
+nss-devel
+openssl-devel
+pixman
+pkgconfig
+psmisc
+pulseaudio-libs
+python2-pip-8.1.2-6.el7.noarch http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/
+python-cffi
+python-devel
+python-setuptools
+python-virtualenv
+qemu-img-ev-2.9.0-16.el7_4.13.1.x86_64 http://mirror.centos.org/centos-7/7/virt/x86_64/kvm-common/
+qemu-kvm-common-ev-2.9.0-16.el7_4.13.1.x86_64 http://mirror.centos.org/centos-7/7/virt/x86_64/kvm-common/
+qemu-kvm-ev-2.9.0-16.el7_4.13.1.x86_64 http://mirror.centos.org/centos-7/7/virt/x86_64/kvm-common/
+qemu-kvm-tools-ev-2.9.0-16.el7_4.13.1.x86_64 http://mirror.centos.org/centos-7/7/virt/x86_64/kvm-common/
+seabios-bin
+seavgabios-bin
+selinux-policy
+selinux-policy-devel
+sgabios-bin
+socat
+spice-server
+strongswan-5.7.1-1.el7.x86_64 http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/s/
+tcpdump
+trousers
+unzip
+usbredir
+yum-utils
+zlib-devel
diff --git a/resources/tools/disk-image-builder/centos/run-listmaker.sh b/resources/tools/disk-image-builder/centos/run-listmaker.sh
index b94f9fa3de..fe353deab5 100755
--- a/resources/tools/disk-image-builder/centos/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/centos/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:
@@ -94,7 +94,7 @@ enabled=0
         OS="centos-7.4-1711"
         VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7.4-1711.yaml"
     else
-        echo specify argument -- probably centos-7-1511 or centos-7.3-1611
+        echo specify argument -- probably centos-7-1511 or centos-7.3-1611 or centos-7.4-1711
         exit 1
     fi
 fi
@@ -123,6 +123,7 @@ python2-pip-8.1.2-5.el7.noarch http://mirror.math.princeton.edu/pub/epel/7/x86_6
 openssl-devel
 git
 strongswan-5.6.1-2.el7.x86_64 http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/s/
+python-cffi
 #RPM_WANTLIST_TLDK
 tcpdump
 #RPM_WANTLIST_VPP
-- 
cgit 1.2.3-korg