From 3384969a087da01d261c3b9e381add2c43721b6a Mon Sep 17 00:00:00 2001 From: Thomas F Herbert Date: Sun, 14 Apr 2019 15:12:10 -0400 Subject: [PATCH] Centos 7.6-1810 image update. Add python36 and update qemu to 2.12. add boost-filesystem Change-Id: I89bba0b807be6d6c2d98b2f07faae9c31b3370e1 Signed-off-by: Thomas F Herbert --- VIRL_RELEASE_CENTOS | 2 +- .../tools/disk-image-builder/centos/CHANGELOG | 12 +++ .../disk-image-builder/centos/build-listmaker.sh | 11 ++- .../disk-image-builder/centos/centos-7.6-1810.json | 110 +++++++++++++++++++++ .../centos/listmaker/centos-7.6-1810.json | 48 +++++++++ .../listmaker/virl-listmaker-centos-7.6-1810.yaml | 12 +++ .../pip-requirements.txt | 20 ++++ .../rpm-packages.txt | 76 ++++++++++++++ .../disk-image-builder/centos/run-listmaker.sh | 58 ++++++----- 9 files changed, 323 insertions(+), 26 deletions(-) create mode 100644 resources/tools/disk-image-builder/centos/centos-7.6-1810.json create mode 100644 resources/tools/disk-image-builder/centos/listmaker/centos-7.6-1810.json create mode 100644 resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.6-1810.yaml create mode 100644 resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/pip-requirements.txt create mode 100644 resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/rpm-packages.txt diff --git a/VIRL_RELEASE_CENTOS b/VIRL_RELEASE_CENTOS index 2332009010..87c920bb6f 100644 --- a/VIRL_RELEASE_CENTOS +++ b/VIRL_RELEASE_CENTOS @@ -1 +1 @@ -csit-centos-7.4-1711_2019-01-04_2.1 \ No newline at end of file +csit-centos-7.6-1810_2019-04-15_2.4 diff --git a/resources/tools/disk-image-builder/centos/CHANGELOG b/resources/tools/disk-image-builder/centos/CHANGELOG index 7588311fbd..42a3d8781d 100644 --- a/resources/tools/disk-image-builder/centos/CHANGELOG +++ b/resources/tools/disk-image-builder/centos/CHANGELOG @@ -1,3 +1,15 @@ +## [2.4] - 2019-04-15 + +Add boost-filesystem + +## [2.3] - 2019-04-14 + +Add mbedtls-devel + +## [2.2] - 2019-04-12 + +Add python36, update image to Centos 7.6 and qemu to 2.12. + ## [2.1] - 2019-01-04 Add pexpect, dill, numpy and scipy to pip requirements. diff --git a/resources/tools/disk-image-builder/centos/build-listmaker.sh b/resources/tools/disk-image-builder/centos/build-listmaker.sh index 6aa5493a58..98adb905f6 100755 --- a/resources/tools/disk-image-builder/centos/build-listmaker.sh +++ b/resources/tools/disk-image-builder/centos/build-listmaker.sh @@ -31,9 +31,14 @@ else RELEASE_NAME="csit-centos-7.4-1711-listmaker" PACKER_TEMPLATE="listmaker/centos-7.4-1711.json" else - echo "Please provide OS as parameter:" - echo "Options: ${0} [centos-7-1511|centos-7.3-1611|centos-7.4-1711]" - exit 1 + if [ "$1" = "centos-7.6-1810" ]; then + RELEASE_NAME="csit-centos-7.6-1810-listmaker" + PACKER_TEMPLATE="listmaker/centos-7.6-1810.json" + else + echo "Please provide OS as parameter:" + echo "Options: ${0} [centos-7.3-1611|centos-7.4-1711|centos-7.6-1810]" + exit 1 + fi fi fi diff --git a/resources/tools/disk-image-builder/centos/centos-7.6-1810.json b/resources/tools/disk-image-builder/centos/centos-7.6-1810.json new file mode 100644 index 0000000000..feecbe5b0e --- /dev/null +++ b/resources/tools/disk-image-builder/centos/centos-7.6-1810.json @@ -0,0 +1,110 @@ +{ + "_c": "CentOS-7 ISO URL at the time of creation of this file (04/2019)", + "_c": "was https://mirror.math.princeton.edu/pub/centos/7.6.1810/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso.", + "_c": "", + "variables": { + "release": null, + "output_dir": null, + "temp_dir": null, + "atlas_token": "{{env `ATLAS_TOKEN`}}", + "virl_user": "{{env `VIRL_USER`}}", + "virl_password": "{{env `VIRL_PASSWORD`}}" + }, + "builders": [ + { + "name": "{{user `release`}}-virtualbox", + "type": "virtualbox-iso", + "guest_os_type": "RedHat_64", + "iso_url": "https://mirror.math.princeton.edu/pub/centos/7.6.1810/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso", + "iso_checksum": "5833cb3189a61c02abf50fb8c2db16cfa669bc3c", + "iso_checksum_type": "sha1", + "output_directory": "{{user `output_dir`}}", + "ssh_username": "root", + "ssh_password": "csit", + "ssh_wait_timeout": "30m", + "disk_size": "16384", + "shutdown_command": "echo 'packer' | sudo -S /sbin/halt -h -p", + "http_directory": "html", + "iso_target_path" : "build/CentOS-7-x86_64-Minimal-1810.iso", + "headless": "true", + "boot_command": + [ + " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" + ] + }, + { + "name": "{{user `release`}}-qemu", + "type": "qemu", + "iso_url": "https://mirror.math.princeton.edu/pub/centos/7.6.1810/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso", + "iso_checksum": "5833cb3189a61c02abf50fb8c2db16cfa669bc3c", + "iso_checksum_type": "sha1", + "output_directory": "{{user `output_dir`}}", + "ssh_username": "root", + "ssh_password": "csit", + "ssh_wait_timeout": "30m", + "disk_size": "16384", + "shutdown_command": "echo 'packer' | sudo -S /sbin/halt -h -p", + "http_directory": "html", + "iso_target_path" : "build/CentOS-7-x86_64-Minimal-1810.iso", + "headless": "true", + "boot_command": + [ + " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" + ] + } + ], + "provisioners": [ + { + "type": "file", + "source": "{{ user `temp_dir`}}", + "destination": "/root" + }, + { + "type": "shell", + "script": "scripts-remote/post-install.sh" + }, + { + "type": "shell", + "only": ["{{user `release`}}-qemu"], + "script": "scripts-remote/serial-console-centos-7-1511.sh" + }, + { + "type": "shell", + "only": ["{{user `release`}}-virtualbox"], + "script": "scripts-remote/vagrant-user.sh" + }, + { + "type": "shell", + "only": ["{{user `release`}}-virtualbox"], + "script": "scripts-remote/vagrant-guestadditions.sh" + }, + { + "type": "shell", + "script": "scripts-remote/disable_ipv6.sh" + }, + { + "type": "shell", + "script": "scripts-remote/cleanup.sh" + } + ], + "post-processors": [ + { + "type": "vagrant", + "only": ["{{user `release`}}-virtualbox"], + "keep_input_artifact": true + }, + { + "type": "shell-local", + "only": ["{{user `release`}}-qemu"], + "script": "scripts-local/upload-image-to-virl.sh", + "keep_input_artifact": true, + "environment_vars": + [ + "VIRL_USER={{user `virl_user`}}", + "VIRL_PASSWORD={{user `virl_password`}}", + "VIRL_IMAGE_SUBTYPE=server", + "VIRL_IMAGE_NAME={{user `release`}}" + ] + } + ] +} diff --git a/resources/tools/disk-image-builder/centos/listmaker/centos-7.6-1810.json b/resources/tools/disk-image-builder/centos/listmaker/centos-7.6-1810.json new file mode 100644 index 0000000000..450e678fa5 --- /dev/null +++ b/resources/tools/disk-image-builder/centos/listmaker/centos-7.6-1810.json @@ -0,0 +1,48 @@ +{ + "_c": "Centos7 ISO URL at the time of creation of this file (4/2019)", + "_c": "was https://mirror.math.princeton.edu/pub/centos/7.6.1810/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso.", + "_c": "", + "variables": { + "release": null, + "outputdir": null, + "atlas_token": "{{env `ATLAS_TOKEN`}}", + "virl_user": "{{env `VIRL_USER`}}", + "virl_password": "{{env `VIRL_PASSWORD`}}" + }, + "builders": [ + { + "name": "{{user `release`}}", + "type": "qemu", + "iso_url": "https://mirror.math.princeton.edu/pub/centos/7.6.1810/isos/x86_64/CentOS-7-x86_64-Minimal-1810.iso", + "iso_checksum": "5833cb3189a61c02abf50fb8c2db16cfa669bc3c", + "iso_checksum_type": "sha1", + "output_directory": "{{user `outputdir`}}", + "ssh_username": "root", + "ssh_password": "csit", + "ssh_wait_timeout": "30m", + "disk_size": "16384", + "shutdown_command": "shutdown -P now", + "http_directory": "html", + "iso_target_path" : "build/CentOS-7-x86_64-Minimal-1810.iso", + "headless": "true", + "boot_command": + [ + " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg" + ] + } + ], + "post-processors": [ + { + "type": "shell-local", + "script": "scripts-local/upload-image-to-virl.sh", + "keep_input_artifact": true, + "environment_vars": + [ + "VIRL_USER={{user `virl_user`}}", + "VIRL_PASSWORD={{user `virl_password`}}", + "VIRL_IMAGE_SUBTYPE=server", + "VIRL_IMAGE_NAME={{user `release`}}" + ] + } + ] +} diff --git a/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.6-1810.yaml b/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.6-1810.yaml new file mode 100644 index 0000000000..c379d82be8 --- /dev/null +++ b/resources/tools/disk-image-builder/centos/listmaker/virl-listmaker-centos-7.6-1810.yaml @@ -0,0 +1,12 @@ + + + + flat + + + + UNUSED + false + + + diff --git a/resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/pip-requirements.txt b/resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/pip-requirements.txt new file mode 100644 index 0000000000..8c32526d61 --- /dev/null +++ b/resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/pip-requirements.txt @@ -0,0 +1,20 @@ +aenum==2.1.2 +dill==0.2.8.2 +docopt==0.6.2 +ecdsa==0.13 +enum34==1.1.2 +numpy==1.14.5 +paramiko==1.16.0 +pexpect==4.6.0 +ptyprocess==0.6.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 +scipy==1.1.0 +scp==0.10.2 +six==1.12.0 diff --git a/resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/rpm-packages.txt b/resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/rpm-packages.txt new file mode 100644 index 0000000000..d8aa3df0bb --- /dev/null +++ b/resources/tools/disk-image-builder/centos/lists/centos-7.6-1810_2019-04-15_2.4/rpm-packages.txt @@ -0,0 +1,76 @@ +boost-filesystem +bridge-utils +cloud-init +device-mapper-multipath-libs +dkms-2.6.1-1.el7.noarch https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/d/ +elfutils-libelf +elfutils-libelf-devel +epel-release +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 +libepoxy +libffi-devel +libibumad +libibverbs +libiscsi +libnettle +libpcap +libpcap-devel +libpng +librados2 +librbd1 +librdmacm +libseccomp +libusb +mbedtls-2.7.10-1.el7.x86_64 https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/ +mbedtls-devel-2.7.10-1.el7.x86_64 https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/ +nfs-utils +nss-devel +openssl-devel +pixman +pkgconfig +psmisc +pulseaudio-libs +python2-pip-8.1.2-8.el7.noarch http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/ +python36-devel +python36-pip +python36-ply +python-cffi +python-devel +python-rpm-macros +python-setuptools +python-srpm-macros +python-virtualenv +qemu-img-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +qemu-kvm-common-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +qemu-kvm-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +qemu-kvm-tools-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +redhat-rpm-config +seabios-bin +seavgabios-bin +selinux-policy +selinux-policy-devel +sgabios-bin +socat +spice-server +spice-server-devel +strongswan-5.7.2-1.el7.x86_64 http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/s/ +tcpdump +trousers +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 fe353deab5..b72d8021c9 100755 --- a/resources/tools/disk-image-builder/centos/run-listmaker.sh +++ b/resources/tools/disk-image-builder/centos/run-listmaker.sh @@ -42,16 +42,11 @@ RPMS_TMP_DIR=`mktemp -d` RPMS_WANTED_FILE=$RPMS_TMP_DIR/rpms_wanted.txt REPO_MOD_FILE=$RPMS_TMP_DIR/Centos-Vault.repo -if [ "$1" == "centos-7-1511" ] +if [ "$1" == "centos-7.3-1611" ] then - OS="centos-7-1511" - VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7-1511.yaml" -else - if [ "$1" == "centos-7.3-1611" ] - then - OS="centos-7.3-1611" - VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7.3-1611.yaml" - echo ' + OS="centos-7.3-1611" + VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7.3-1611.yaml" +echo ' # C7.3.1611 [C7.3.1611-base] name=CentOS-7.3.1611 - Base @@ -89,12 +84,17 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled=0 ' > $REPO_MOD_FILE - elif [ "$1" == "centos-7.4-1711" ] - then - OS="centos-7.4-1711" - VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7.4-1711.yaml" +else + if [ "$1" == "centos-7.4-1711" ] + then + OS="centos-7.4-1711" + VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7.4-1711.yaml" + elif [ "$1" == "centos-7.6-1810" ] + then + OS="centos-7.6-1810" + VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-centos-7.6-1810.yaml" else - echo specify argument -- probably centos-7-1511 or centos-7.3-1611 or centos-7.4-1711 + echo specify argument -- probably centos-7.3-1611 , centos-7.4-1711 or centos-7.6-1810 exit 1 fi fi @@ -119,10 +119,18 @@ yum-utils python-devel python-virtualenv python-setuptools -python2-pip-8.1.2-5.el7.noarch http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/p/ +redhat-rpm-config +epel-release +python-srpm-macros +python-rpm-macros +python36-ply +python36-devel +python36-pip +python2-pip-8.1.2-8.el7.noarch http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/ openssl-devel git -strongswan-5.6.1-2.el7.x86_64 http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/s/ +trousers +strongswan-5.7.2-1.el7.x86_64 http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/s/ python-cffi #RPM_WANTLIST_TLDK tcpdump @@ -131,11 +139,12 @@ elfutils-libelf elfutils-libelf-devel kernel-debug-devel gcc -dkms-2.4.0-1.20170926git959bd74.el7.noarch http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/d/ +dkms-2.6.1-1.el7.noarch https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/d/ bridge-utils selinux-policy selinux-policy-devel -mbedtls-2.7.0-1.el7.x86_64 http://mirror.math.princeton.edu/pub/epel/7/x86_64/Packages/m/ +mbedtls-2.7.10-1.el7.x86_64 https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/ +mbedtls-devel-2.7.10-1.el7.x86_64 https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/ #RPM_WANTLIST_TREX zlib-devel unzip @@ -157,6 +166,7 @@ librbd1 librdmacm libseccomp spice-server +spice-server-devel libusb usbredir glusterfs-devel @@ -166,6 +176,7 @@ ipxe-roms-qemu nss-devel seabios-bin libffi-devel +boost-filesystem #RPM_WANTLIST_NESTED trousers libnettle @@ -173,10 +184,13 @@ gnutls libcacard libcacard-tools libcacard-devel -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-tools-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/ +device-mapper-multipath-libs +libepoxy +libibumad +qemu-img-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +qemu-kvm-tools-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +qemu-kvm-common-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ +qemu-kvm-ev-2.12.0-18.el7_6.3.1.x86_64 http://mirror.centos.org/centos/7/virt/x86_64/kvm-common/ #RPM_WANTLIST_JAVA java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel -- 2.16.6