Add DEPENDENCIES file and source Vagrant and tests versions from it.
- One unique file to list all dependencies and dependencies' versions (except Go, currently defined in `build/Dockerfile`). - Custom versions can now be injected into Vagrant VMs. - Vagrant dev VMs, Vagrant test VMs, and `run-integration-tests.sh` all source from `DEPENDENCIES`, to keep things 'DRY'. - Vagrant versions can be overriden using environment variables, like it was possible in `run-integration-tests.sh`.
This commit is contained in:
1 parent
3ce8aec039
commit
1b45e8662e
5 files changed
+22
-4
No files matched your search
Vendored
+1
@@ -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
|
||||
|
||||
@@ -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}
|
||||
|
||||
Reference in new issue
Block a user