From b2da960212571fc3e287eedcdc4c8c92fed9bf83 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Mon, 20 Nov 2017 11:19:17 -0500
Subject: update opnfv/containter box

1. add flannel, calico, busybox, nginx and ubuntu in box,
2. use whole file instead of patch
3. deploy new box

Change-Id: I937e0df264ff7b639b4d6e8b7199f9502e502340
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 ci/bento.k8s.diff   | 33 ------------------------------
 ci/deploy.sh        |  1 +
 ci/setup_vagrant.sh |  2 +-
 ci/update.sh        | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 34 deletions(-)
 delete mode 100644 ci/bento.k8s.diff
 create mode 100644 ci/update.sh

diff --git a/ci/bento.k8s.diff b/ci/bento.k8s.diff
deleted file mode 100644
index 6fac10f..0000000
--- a/ci/bento.k8s.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/ubuntu/scripts/update.sh b/ubuntu/scripts/update.sh
-index 9e872b6..02b9058 100644
---- a/ubuntu/scripts/update.sh
-+++ b/ubuntu/scripts/update.sh
-@@ -25,3 +25,28 @@ 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 <<EOF | tee /etc/apt/sources.list.d/kubernetes.list
-+deb http://apt.kubernetes.io/ kubernetes-xenial main
-+EOF
-+apt-get update
-+apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
-+
-+docker pull gcr.io/google_containers/kube-proxy-amd64:v1.7.10
-+docker pull gcr.io/google_containers/kube-apiserver-amd64:v1.7.10
-+docker pull gcr.io/google_containers/kube-controller-manager-amd64:v1.7.10
-+docker pull gcr.io/google_containers/kube-scheduler-amd64:v1.7.10
-+docker pull weaveworks/weave-npc:2.0.5
-+docker pull weaveworks/weave-kube:2.0.5
-+docker pull gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
-+docker pull gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
-+docker pull gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
-+docker pull gcr.io/google_containers/etcd-amd64:3.0.17
-+docker pull gcr.io/google_containers/pause-amd64:3.0
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 2b335e4..29871e9 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -17,6 +17,7 @@
 
 set -ex
 
+./setup_vagrant.sh
 ./cleanup.sh
 ../src/vagrant/kubeadm_ovsdpdk/deploy.sh
 ../src/vagrant/kubeadm_multus/deploy.sh
diff --git a/ci/setup_vagrant.sh b/ci/setup_vagrant.sh
index 3cc05de..a7e836e 100755
--- a/ci/setup_vagrant.sh
+++ b/ci/setup_vagrant.sh
@@ -21,9 +21,9 @@ build_box() {
     # 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
-    patch -p1 < ../bento.k8s.diff
     cd ubuntu
     ../packer build -var 'headless=true' -only=virtualbox-iso ubuntu-16.04-amd64.json
     vagrant box remove -f opnfv/container4nfv --all || true
diff --git a/ci/update.sh b/ci/update.sh
new file mode 100644
index 0000000..18752b9
--- /dev/null
+++ b/ci/update.sh
@@ -0,0 +1,58 @@
+#!/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 <<EOF >/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 <<EOF >/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 <<EOF | tee /etc/apt/sources.list.d/kubernetes.list
+deb http://apt.kubernetes.io/ kubernetes-xenial main
+EOF
+apt-get update
+apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+
+docker pull gcr.io/google_containers/kube-proxy-amd64:v1.7.10
+docker pull gcr.io/google_containers/kube-apiserver-amd64:v1.7.10
+docker pull gcr.io/google_containers/kube-controller-manager-amd64:v1.7.10
+docker pull gcr.io/google_containers/kube-scheduler-amd64:v1.7.10
+docker pull gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
+docker pull gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
+docker pull gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
+docker pull gcr.io/google_containers/etcd-amd64:3.0.17
+docker pull gcr.io/google_containers/pause-amd64:3.0
+docker pull ubuntu:16.04
+docker pull nginx:1.13.6
+docker pull busybox:1.27.2
+docker pull weaveworks/weave-npc:2.0.5
+docker pull weaveworks/weave-kube:2.0.5
+docker pull quay.io/coreos/flannel:v0.9.0-amd64
+docker pull quay.io/calico/cni:v1.8.0
+docker pull quay.io/calico/node:v1.1.3
-- 
cgit 1.2.3-korg