From 26013163411b419fcf60866d61a028c62737e282 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Sun, 26 Nov 2017 13:31:05 -0500 Subject: build vagrant/libvirt box 1. build box based on chef/bento 2. move setup_vagrant to src/vagrant Change-Id: I69dffac9e16435b20975a4c73a2ac37543a8edf5 Signed-off-by: Guo Ruijing --- ci/setup_ci.sh | 11 ++++++++ ci/setup_vagrant.sh | 45 -------------------------------- ci/update.sh | 58 ----------------------------------------- src/vagrant/README.md | 23 ---------------- src/vagrant/setup_vagrant.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++ src/vagrant/update.sh | 58 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 131 insertions(+), 126 deletions(-) create mode 100755 ci/setup_ci.sh delete mode 100755 ci/setup_vagrant.sh delete mode 100644 ci/update.sh delete mode 100644 src/vagrant/README.md create mode 100755 src/vagrant/setup_vagrant.sh create mode 100644 src/vagrant/update.sh diff --git a/ci/setup_ci.sh b/ci/setup_ci.sh new file mode 100755 index 0000000..f2e352f --- /dev/null +++ b/ci/setup_ci.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +echo "Please run it by jenkins account!" +cat << EOF | sudo tee /etc/sudoers.d/${USER} +${USER} ALL = (root) NOPASSWD:ALL +EOF +sudo apt-get update > /dev/null +sudo apt install -y qemu-kvm libvirt-bin 2>1 /dev/null +echo "Plsease reboot/logout to make effective for libvirt group adding" diff --git a/ci/setup_vagrant.sh b/ci/setup_vagrant.sh deleted file mode 100755 index 1a09ffb..0000000 --- a/ci/setup_vagrant.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -ex - -install_packages() -{ - cat << EOF | sudo tee /etc/sudoers.d/${USER} -${USER} ALL = (root) NOPASSWD:ALL -EOF - sudo apt-get update -y - sudo apt-get install -y openssh-server git virtualbox unzip - wget https://releases.hashicorp.com/vagrant/1.8.7/vagrant_1.8.7_x86_64.deb - sudo dpkg -i vagrant_1.8.7_x86_64.deb - rm -rf vagrant_1.8.7_x86_64.deb -} - -build_box() { - rm -rf ~/'VirtualBox VMs'/ubuntu-16.04-amd64 - rm -rf bento - # Thanks Bento's great effort - # Bento project(https://github.com/chef/bento) is released by Apache 2.0 License - git clone https://github.com/chef/bento - cd bento; git checkout 05d98910d835b503e7be3d2e4071956f66fbbbc4 - cp ../update.sh ubuntu/scripts/ - wget https://releases.hashicorp.com/packer/1.1.2/packer_1.1.2_linux_amd64.zip - unzip packer_1.1.2_linux_amd64.zip - cd ubuntu - sed -i 's/"disk_size": "40960"/"disk_size": "409600"/' ubuntu-16.04-amd64.json - ../packer build -var 'headless=true' -only=virtualbox-iso ubuntu-16.04-amd64.json - vagrant box remove -f opnfv/container4nfv --all || true - vagrant box add opnfv/container4nfv ../builds/ubuntu-16.04.virtualbox.box -} - -install_vagrant_libvirt() { - #refer to https://github.com/vagrant-libvirt/vagrant-libvirt - #sudo apt-get build-dep vagrant ruby-libvirt -y - sudo apt-get install -y qemu libvirt-bin ebtables dnsmasq - sudo apt-get install -y libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev - vagrant plugin install vagrant-libvirt - sudo adduser ${USER} libvirtd - sudo service libvirtd restart -} - -install_packages -build_box diff --git a/ci/update.sh b/ci/update.sh deleted file mode 100644 index 18752b9..0000000 --- a/ci/update.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -eux -export DEBIAN_FRONTEND=noninteractive - -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - -# Disable release-upgrades -sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades; - -# Update the package list -apt-get -y update; - -# update package index on boot -cat </etc/init/refresh-apt.conf; -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF - -# Disable periodic activities of apt -cat </etc/apt/apt.conf.d/10disable-periodic; -APT::Periodic::Enable "0"; -EOF - -# Upgrade all installed packages incl. kernel and kernel headers -apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; - -apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D -apt-key adv -k 58118E89F3A912897C070ADBF76221572C52609D -cat << EOF | tee /etc/apt/sources.list.d/docker.list -deb [arch=amd64] https://apt.dockerproject.org/repo ubuntu-xenial main -EOF - -curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - -cat </etc/init/refresh-apt.conf; +description "update package index" +start on networking +task +exec /usr/bin/apt-get update +EOF + +# Disable periodic activities of apt +cat </etc/apt/apt.conf.d/10disable-periodic; +APT::Periodic::Enable "0"; +EOF + +# Upgrade all installed packages incl. kernel and kernel headers +apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"; + +apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D +apt-key adv -k 58118E89F3A912897C070ADBF76221572C52609D +cat << EOF | tee /etc/apt/sources.list.d/docker.list +deb [arch=amd64] https://apt.dockerproject.org/repo ubuntu-xenial main +EOF + +curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - +cat <