Merge pull request #2796 from weaveworks/versions-manifest

Add versions manifest file for dependencies.

DEPENDENCIES

@@ -0,0 +1,3 @@
+DOCKER_VERSION=1.11.2
+KUBERNETES_VERSION=1.5.2
+KUBERNETES_CNI_VERSION=0.3.0.1

Vagrantfile

@@ -9,7 +9,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network "private_network", ip: vm_ip
   config.vm.provider :virtualbox do |vb|
     vb.memory = 2048
-    configure_nat_dns(vb)    
+    configure_nat_dns(vb)
   end
 
   # Disable default Vagrant shared folder, which we don't need:
@@ -29,7 +29,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     ansible.playbook = 'tools/config_management/setup_weave-net_dev.yml'
     ansible.extra_vars = {
       go_version: GO_VERSION
-    }
+    }.merge(ansibleize(get_dependencies_version_from_file_and_env()))
   end
 end
 

test/Vagrantfile

@@ -55,6 +55,7 @@ END
         host.vm.provision 'ansible' do |ansible|
           ansible.limit = 'all'  # Disable default limit to connect to all the machines
           ansible.playbook = '../tools/config_management/setup_weave-net_test.yml'
+          ansible.extra_vars = ansibleize(get_dependencies_version_from_file_and_env())
         end
       end
     end

test/run-integration-tests.sh

@@ -29,9 +29,9 @@ PLAYBOOK=${PLAYBOOK:-setup_weave-net_test.yml}
 TESTS=${TESTS:-}
 RUNNER_ARGS=${RUNNER_ARGS:-""}
 # Dependencies' versions:
-DOCKER_VERSION=${DOCKER_VERSION:-1.11.2}
-KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.5.2}
-KUBERNETES_CNI_VERSION=${KUBERNETES_CNI_VERSION:-0.3.0.1}
+DOCKER_VERSION=${DOCKER_VERSION:-"$(grep -oP "(?<=DOCKER_VERSION=).*" "$DIR/../DEPENDENCIES")"}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-"$(grep -oP "(?<=KUBERNETES_VERSION=).*" "$DIR/../DEPENDENCIES")"}
+KUBERNETES_CNI_VERSION=${KUBERNETES_CNI_VERSION:-"$(grep -oP "(?<=KUBERNETES_CNI_VERSION=).*" "$DIR/../DEPENDENCIES")"}
 # Google Cloud Platform image's name & usage (only used when PROVIDER is gcp):
 IMAGE_NAME=${IMAGE_NAME:-"$(echo "$APP-docker$DOCKER_VERSION-k8s$KUBERNETES_VERSION-k8scni$KUBERNETES_CNI_VERSION" | sed -e 's/[\.\_]*//g')"}
 DISK_NAME_PREFIX=${DISK_NAME_PREFIX:-$NAME}

vagrant-common.rb

@@ -1,10 +1,24 @@
 VAGRANT_IMAGE = 'bento/ubuntu-16.04'
 VAGRANTFILE_API_VERSION = '2'
 
+def get_dependencies_version_from_file_and_env()
+  dependencies_file = File.join(File.dirname(__FILE__), 'DEPENDENCIES')
+  # Read default version from the DEPENDENCIES file:
+  versions = File.readlines(dependencies_file).map{|line| line.strip.split('=')}.to_h
+  # Override with environment variables if defined:
+  versions.each do |k,v|
+    versions[k] = ENV.key?(k) ? ENV[k] : v
+  end
+end
+
+def ansibleize(h)
+  h.map{|k,v| [k.downcase, v]}.to_h
+end
+
 def get_go_version_from_build_dockerfile()
   go_regexp = /FROM golang:(\S*).*?/
   dockerfile_path = File.expand_path(File.join(File.dirname(__FILE__), 'build', 'Dockerfile'))
-  go_version = File.readlines(dockerfile_path).first { |line| line.match(go_regexp) }.match(go_regexp).captures.first
+  go_version = File.readlines(dockerfile_path).select { |line| line.match(go_regexp) }.first.match(go_regexp).captures.first
   if go_version.nil?
     raise ArgumentError.new("Failed to read Go version from Dockerfile.")
   end