diff options
Diffstat (limited to 'resources/tools/disk-image-builder/centos')
7 files changed, 84 insertions, 12 deletions
diff --git a/resources/tools/disk-image-builder/centos/CHANGELOG b/resources/tools/disk-image-builder/centos/CHANGELOG index 5d4b0d2734..c22e4bf6f3 100644 --- a/resources/tools/disk-image-builder/centos/CHANGELOG +++ b/resources/tools/disk-image-builder/centos/CHANGELOG @@ -1,3 +1,7 @@ +## [1.5] - 2017-08-01 + +Added tcpdump. + ## [1.4] - 2017-02-23 Added pypcap. diff --git a/resources/tools/disk-image-builder/centos/centos-7.3-1611.json b/resources/tools/disk-image-builder/centos/centos-7.3-1611.json index 557efc795e..da22c749d4 100644 --- a/resources/tools/disk-image-builder/centos/centos-7.3-1611.json +++ b/resources/tools/disk-image-builder/centos/centos-7.3-1611.json @@ -1,6 +1,6 @@ { - "_c": "CentOS-7 ISO URL at the time of creation of this file (05/2016)", - "_c": "was http://centos.chicago.waneq.com/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso.", + "_c": "CentOS-7 ISO URL at the time of creation of this file (08/2017)", + "_c": "was http://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-Minimal.iso.", "_c": "", "variables": { "release": null, @@ -15,8 +15,8 @@ "name": "{{user `release`}}-virtualbox", "type": "virtualbox-iso", "guest_os_type": "RedHat_64", - "iso_url": "http://centos.chicago.waneq.com/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso", - "iso_checksum": "71a7aa147877b413497cdff5b1e0aa5bc0c9484f", + "iso_url": "http://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-Minimal.iso", + "iso_checksum": "c93c4a9755ebff419ac0a4d5052ed1f8b6fb84f9", "iso_checksum_type": "sha1", "output_directory": "{{user `output_dir`}}", "ssh_username": "root", @@ -35,8 +35,8 @@ { "name": "{{user `release`}}-qemu", "type": "qemu", - "iso_url": "http://centos.chicago.waneq.com/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso", - "iso_checksum": "71a7aa147877b413497cdff5b1e0aa5bc0c9484f", + "iso_url": "http://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-Minimal.iso", + "iso_checksum": "c93c4a9755ebff419ac0a4d5052ed1f8b6fb84f9", "iso_checksum_type": "sha1", "output_directory": "{{user `output_dir`}}", "ssh_username": "root", diff --git a/resources/tools/disk-image-builder/centos/listmaker/centos-7.3-1611.json b/resources/tools/disk-image-builder/centos/listmaker/centos-7.3-1611.json index 7504ca9941..cdaf9021da 100644 --- a/resources/tools/disk-image-builder/centos/listmaker/centos-7.3-1611.json +++ b/resources/tools/disk-image-builder/centos/listmaker/centos-7.3-1611.json @@ -1,6 +1,6 @@ { - "_c": "Centos7 ISO URL at the time of creation of this file (12/2016)", - "_c": "http://centos.chicago.waneq.com/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso", + "_c": "Centos7 ISO URL at the time of creation of this file (8/2017)", + "_c": "http://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-Minimal.iso", "_c": "", "variables": { "release": null, @@ -13,8 +13,8 @@ { "name": "{{user `release`}}", "type": "qemu", - "iso_url": "http://centos.chicago.waneq.com/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso", - "iso_checksum": "71a7aa147877b413497cdff5b1e0aa5bc0c9484f", + "iso_url": "http://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-Minimal.iso", + "iso_checksum": "c93c4a9755ebff419ac0a4d5052ed1f8b6fb84f9", "iso_checksum_type": "sha1", "output_directory": "{{user `outputdir`}}", "ssh_username": "root", diff --git a/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.3-1611.yaml b/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.3-1611.yaml index fd33db0faf..11287944c1 100644 --- a/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.3-1611.yaml +++ b/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.3-1611.yaml @@ -3,7 +3,7 @@ <extensions> <entry key="management_network" type="String">flat</entry> </extensions> - <node name="listmaker" type="SIMPLE" subtype="server" location="570,238" vmImage="server-csit-centos-7-1511-listmaker"> + <node name="listmaker" type="SIMPLE" subtype="server" location="570,238" vmImage="server-csit-centos-7.3-1611-listmaker"> <extensions> <entry key="config" type="String">UNUSED</entry> <entry key="Auto-generate config" type="Boolean">false</entry> diff --git a/resources/tools/disk-image-builder/centos/lists/centos-7.3-1611_2017-08-01_1.5/pip-requirements.txt b/resources/tools/disk-image-builder/centos/lists/centos-7.3-1611_2017-08-01_1.5/pip-requirements.txt new file mode 100644 index 0000000000..3169b1421b --- /dev/null +++ b/resources/tools/disk-image-builder/centos/lists/centos-7.3-1611_2017-08-01_1.5/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
\ No newline at end of file diff --git a/resources/tools/disk-image-builder/centos/lists/centos-7.3-1611_2017-08-01_1.5/rpm-packages.txt b/resources/tools/disk-image-builder/centos/lists/centos-7.3-1611_2017-08-01_1.5/rpm-packages.txt new file mode 100644 index 0000000000..b3a796bd2a --- /dev/null +++ b/resources/tools/disk-image-builder/centos/lists/centos-7.3-1611_2017-08-01_1.5/rpm-packages.txt @@ -0,0 +1,52 @@ +bridge-utils +cloud-init +dkms +git +glusterfs +glusterfs-api +glusterfs-devel +gperftools +ipxe-roms-qemu +java-1.8.0-openjdk-devel +java-1.8.0-openjdk-headless +libibverbs +libiscsi +libpcap +libpcap-devel +libpng +librados2 +librbd1 +librdmacm +libseccomp +libusb +nfs-utils +nss-devel +openssl-devel +pixman +pkgconfig +psmisc +pulseaudio-libs +python-devel +python-pip +python-pip +python-setuptools +python-virtualenv +seabios-bin +seavgabios-bin +sgabios-bin +socat +spice-server +strongswan +tcpdump +unzip +usbredir +yum-utils +zlib-devel +qemu-img-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +libcacard-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +libcacard-devel-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +qemu-kvm-ev-debuginfo-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +qemu-kvm-tools-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +qemu-kvm-common-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +qemu-kvm-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/ +libcacard-tools-ev-2.3.0-31.el7_2.21.1.x86_64.rpm http://cbs.centos.org/kojifiles/packages/qemu-kvm-ev/2.3.0/31.el7_2.21.1/x86_64/
\ No newline at end of file diff --git a/resources/tools/disk-image-builder/centos/run-listmaker.sh b/resources/tools/disk-image-builder/centos/run-listmaker.sh index 0155d9c031..2cc0ec0302 100755 --- a/resources/tools/disk-image-builder/centos/run-listmaker.sh +++ b/resources/tools/disk-image-builder/centos/run-listmaker.sh @@ -62,6 +62,7 @@ echo "Storing data in ${OUTPUT_DIR}/." RPM_WANTLIST_INFRA="nfs-utils cloud-init pkgconfig yum-utils" RPM_WANTLIST_CSIT="python-devel python-pip python-virtualenv python-setuptools python-pip openssl-devel git strongswan" +RPM_WANTLIST_TLDK="tcpdump" RPM_WANTLIST_VPP="dkms bridge-utils" RPM_WANTLIST_TREX="zlib-devel unzip" RPM_WANTLIST_MISC="socat psmisc gperftools glusterfs glusterfs-api libiscsi libibverbs libpcap libpcap-devel pixman libpng pulseaudio-libs librados2 librbd1 librdmacm libseccomp spice-server libusb usbredir glusterfs-devel seavgabios-bin sgabios-bin ipxe-roms-qemu nss-devel seabios-bin" @@ -73,7 +74,7 @@ RPM_WANTLIST_JAVA="java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel" ### For now, do not include WANTLIST_NESTED in the main list. We're installing qemu ### separately because of the possible need for specific versions but the supported version seem to be ok for Centos 7.3 ## -RPM_WANTLIST="$RPM_WANTLIST_INFRA $RPM_WANTLIST_CSIT $RPM_WANTLIST_VPP $RPM_WANTLIST_TREX $RPM_WANTLIST_MISC $RPM_WANTLIST_JAVA" +RPM_WANTLIST="$RPM_WANTLIST_INFRA $RPM_WANTLIST_CSIT $RPM_WANTLIST_VPP $RPM_WANTLIST_TREX $RPM_WANTLIST_MISC $RPM_WANTLIST_JAVA $RPM_WANTLIST_TLDK" RPM_OUTPUTFILE="${OUTPUT_DIR}/rpm-packages.txt" |