From 10f5da3a20e08d3fa9dd8291c5c520eeda32cce8 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Tue, 14 Nov 2017 13:50:08 -0500
Subject: Fix jenkins failure due to docker version upgrade

Change-Id: I4d7c09745484632ff6eebeb442f8b5dd02049584
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 ci/Vagrantfile                            | 2 +-
 src/vagrant/kubeadm_basic/host_setup.sh   | 3 +--
 src/vagrant/kubeadm_multus/host_setup.sh  | 3 +--
 src/vagrant/kubeadm_ovsdpdk/host_setup.sh | 3 +--
 src/vagrant/kubeadm_virtlet/host_setup.sh | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ci/Vagrantfile b/ci/Vagrantfile
index 3569f89..d2e990d 100644
--- a/ci/Vagrantfile
+++ b/ci/Vagrantfile
@@ -12,7 +12,7 @@ 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.io kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+apt-get install -y --allow-downgrades docker.io=1.12.6-0ubuntu1~16.04.1 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
diff --git a/src/vagrant/kubeadm_basic/host_setup.sh b/src/vagrant/kubeadm_basic/host_setup.sh
index 1aad518..95a72df 100644
--- a/src/vagrant/kubeadm_basic/host_setup.sh
+++ b/src/vagrant/kubeadm_basic/host_setup.sh
@@ -15,8 +15,7 @@ cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
 deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 sudo apt-get update
-sudo apt-get install -y docker.io
-sudo apt-get install -y --allow-downgrades kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+sudo apt-get install -y --allow-downgrades docker.io=1.12.6-0ubuntu1~16.04.1 kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
 
 sudo rm -rf /var/lib/kubelet
 sudo systemctl stop kubelet
diff --git a/src/vagrant/kubeadm_multus/host_setup.sh b/src/vagrant/kubeadm_multus/host_setup.sh
index 1aad518..95a72df 100644
--- a/src/vagrant/kubeadm_multus/host_setup.sh
+++ b/src/vagrant/kubeadm_multus/host_setup.sh
@@ -15,8 +15,7 @@ cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
 deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 sudo apt-get update
-sudo apt-get install -y docker.io
-sudo apt-get install -y --allow-downgrades kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+sudo apt-get install -y --allow-downgrades docker.io=1.12.6-0ubuntu1~16.04.1 kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
 
 sudo rm -rf /var/lib/kubelet
 sudo systemctl stop kubelet
diff --git a/src/vagrant/kubeadm_ovsdpdk/host_setup.sh b/src/vagrant/kubeadm_ovsdpdk/host_setup.sh
index 1aad518..95a72df 100644
--- a/src/vagrant/kubeadm_ovsdpdk/host_setup.sh
+++ b/src/vagrant/kubeadm_ovsdpdk/host_setup.sh
@@ -15,8 +15,7 @@ cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
 deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 sudo apt-get update
-sudo apt-get install -y docker.io
-sudo apt-get install -y --allow-downgrades kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+sudo apt-get install -y --allow-downgrades docker.io=1.12.6-0ubuntu1~16.04.1 kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
 
 sudo rm -rf /var/lib/kubelet
 sudo systemctl stop kubelet
diff --git a/src/vagrant/kubeadm_virtlet/host_setup.sh b/src/vagrant/kubeadm_virtlet/host_setup.sh
index 1aad518..95a72df 100644
--- a/src/vagrant/kubeadm_virtlet/host_setup.sh
+++ b/src/vagrant/kubeadm_virtlet/host_setup.sh
@@ -15,8 +15,7 @@ cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list
 deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 sudo apt-get update
-sudo apt-get install -y docker.io
-sudo apt-get install -y --allow-downgrades kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+sudo apt-get install -y --allow-downgrades docker.io=1.12.6-0ubuntu1~16.04.1 kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
 
 sudo rm -rf /var/lib/kubelet
 sudo systemctl stop kubelet
-- 
cgit 1.2.3-korg