Skip to content

Commit 6f9e358

Browse files
committed
Merge pull request #158 from mapuri/master
update the go version check to v1.5.1
2 parents 04426df + 889b2f9 commit 6f9e358

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Vagrantfile

+2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ VAGRANTFILE_API_VERSION = "2"
5656
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
5757
if ENV['CONTIV_NODE_OS'] && ENV['CONTIV_NODE_OS'] == "centos" then
5858
config.vm.box = "contiv/centos71-netplugin"
59+
config.vm.box_version = "0.2.0"
5960
else
6061
config.vm.box = "contiv/ubuntu1504-netplugin"
62+
config.vm.box_version = "0.2.0"
6163
end
6264
num_nodes = 1
6365
if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != "" then

scripts/checks

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ BUILD_PKGS=$1
1313

1414
echo "+++ Checking Go version..."
1515
ver=$(go version | awk '{print $3}')
16-
minVer="go1.4.2"
17-
maxVer="go1.4.2"
16+
minVer="go1.5.1"
17+
maxVer="go1.5.1"
1818
if [[ ${ver} < ${minVer} ]]; then
1919
echo "!!! Go version check failed. Expected >=${minVer} but found ${ver}"
2020
exit 1

0 commit comments

Comments
 (0)