diff --git a/README.md b/README.md index d0c3aa9..6690e25 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ DISCLAIMER: usage of any version of this role implies you have accepted the |:-:|:-:|:-:|:-:| | Debian | Debian | Jessie | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | | Debian | Ubuntu | Precise | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | +| Debian | Ubuntu | Yakkety | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | +| Debian | Ubuntu | Xenial | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | | Debian | Ubuntu | Trusty | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | | Debian | Ubuntu | Vivid | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | | Debian | Ubuntu | Wily | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) | diff --git a/meta/main.yml b/meta/main.yml index b4e99aa..a5844c7 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -29,6 +29,8 @@ galaxy_info: - 6 - name: Ubuntu versions: + - yakkety + - xenial - vivid - trusty - precise diff --git a/tests/Vagrantfile b/tests/Vagrantfile index f4d9406..6e3ff54 100644 --- a/tests/Vagrantfile +++ b/tests/Vagrantfile @@ -26,6 +26,7 @@ Vagrant.configure('2') do |config| host.vm.box = box_settings['box'] unless not box_settings.key? 'box' host.vm.network box_settings['network']['name'], ip: box_settings['network']['ip'] unless box_settings.key? 'network' + host.vm.synced_folder '.', '/vagrant', disabled: true # puts "[DEBUG] applying virtualbox settings for #{box_name} box..." customize_args = [ "modifyvm", :id ] @@ -36,9 +37,25 @@ Vagrant.configure('2') do |config| # puts "[DEBUG] provision using ansible vagrant playbook..." host.vm.provision 'ansible' do |ansible| + + ansible.host_vars = { + 'xenial64.vagrant.dev' => { + 'ansible_python_interpreter' => '/usr/bin/python2.7', + 'playbook_python2' => true + }, + 'yakkety64.vagrant.dev' => { + 'ansible_python_interpreter' => '/usr/bin/python2.7', + 'playbook_python2' => true + } + } + ansible.playbook = PLAYBOOK ansible.verbose = 'v' ansible.skip_tags = 'test' + ansible.extra_vars = { + 'env': 'vagrant', + 'vagrant_box': "#{box_name}" + } end end end diff --git a/tests/boxes.yml b/tests/boxes.yml index 9d31733..84d0fc6 100644 --- a/tests/boxes.yml +++ b/tests/boxes.yml @@ -7,30 +7,6 @@ vagrant: # CentOS - centos64-64.vagrant.dev: - enabled: false - box: hansode/centos-6.4-x86_64 - network: - name: private_network - ip: 192.168.121.1 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - - centos66-64.vagrant.dev: - enabled: false - box: hansode/centos-6.6-x86_64 - network: - name: private_network - ip: 192.168.121.2 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - centos7-64.vagrant.dev: enabled: true box: centos/7 @@ -58,83 +34,9 @@ vagrant: memory: 1024 cpus: 1 - wheezy64.vagrant.dev: - enabled: false - box: debian/wheezy64 - network: - name: private_network - ip: 192.168.122.2 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - - - # Fedora - - fedora20-32.vagrant.dev: - enabled: false - box: hansode/fedora-20-i386 - network: - name: private_network - ip: 192.168.123.1 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - - fedora20-64.vagrant.dev: - enabled: false - box: hansode/fedora-20-x86_64 - network: - name: private_network - ip: 192.168.123.2 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - - fedora21-32.vagrant.dev: - enabled: false - box: hansode/fedora-21-i386 - network: - name: private_network - ip: 192.168.123.3 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - - fedora21-64.vagrant.dev: - enabled: false - box: hansode/fedora-21-x86_64 - network: - name: private_network - ip: 192.168.123.4 - - provider: - virtualbox: - memory: 1024 - cpus: 1 # Ubuntu - precise32.vagrant.dev: - enabled: true - box: ubuntu/precise32 - network: - name: private_network - ip: 192.168.124.1 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - precise64.vagrant.dev: enabled: true box: ubuntu/precise64 @@ -147,18 +49,6 @@ vagrant: memory: 1024 cpus: 1 - trusty32.vagrant.dev: - enabled: true - box: ubuntu/trusty32 - network: - name: private_network - ip: 192.168.124.3 - - provider: - virtualbox: - memory: 1024 - cpus: 1 - trusty64.vagrant.dev: enabled: true box: ubuntu/trusty64 @@ -171,48 +61,48 @@ vagrant: memory: 1024 cpus: 1 - vivid32.vagrant.dev: - enabled: false - box: ubuntu/vivid32 + vivid64.vagrant.dev: + enabled: true + box: ubuntu/vivid64 network: name: private_network - ip: 192.168.124.5 + ip: 192.168.124.6 provider: virtualbox: memory: 1024 cpus: 1 - vivid64.vagrant.dev: + wily64.vagrant.dev: enabled: true box: ubuntu/vivid64 network: name: private_network - ip: 192.168.124.6 + ip: 192.168.124.8 provider: virtualbox: memory: 1024 cpus: 1 - wily32.vagrant.dev: - enabled: false - box: ubuntu/wily32 + xenial64.vagrant.dev: + enabled: true + box: ubuntu/xenial64 network: name: private_network - ip: 192.168.124.7 + ip: 192.168.124.10 provider: virtualbox: memory: 1024 cpus: 1 - wily64.vagrant.dev: + yakkety64.vagrant.dev: enabled: true - box: ubuntu/vivid64 + box: ubuntu/yakkety64 network: name: private_network - ip: 192.168.124.8 + ip: 192.168.124.12 provider: virtualbox: diff --git a/tests/test.yml b/tests/test.yml index f46ffcf..bc2b977 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -1,6 +1,16 @@ --- # file: oracle-java/tests/test.yml +- name: setup python2 + hosts: "{{ vagrant_box }}" + gather_facts: no + + tasks: + - raw: sudo apt-get update -qq && sudo apt-get install -qq python2.7 + when: playbook_python2 is defined and + playbook_python2 + + - name: tests play hosts: all gather_facts: yes @@ -8,7 +18,7 @@ vars: debug: yes test_java_version: 8 - test_java_version_update: 91 + test_java_version_update: 101 test_java_version_build: 14 roles: diff --git a/tests/vagrant.sh b/tests/vagrant.sh index 425cbd5..542b581 100644 --- a/tests/vagrant.sh +++ b/tests/vagrant.sh @@ -3,7 +3,7 @@ # # Bash script to run the test suite against the Vagrant environment. # -# version: 1.2 +# version: 1.8 # # usage: # @@ -16,6 +16,12 @@ # # changelog: # +# v1.8 : 10 August 2016 +# - force provisioning +# +# v1.6 : 10 Jun 2016 +# - exit if USER environment variable is travis +# # v1.4 : 10 Jul 2015 # - remove environment variable ANSIBLE_ASK_SUDO_PASS # @@ -24,6 +30,8 @@ # # ################# +test $USER == 'travis' && exit 0 + DIR="$(dirname "$0")" cd $DIR @@ -56,7 +64,7 @@ do if [ ! -n "${BOX+1}" ] || [ "${BOX}" = "${VAGRANT_BOX}" ]; then echo "[INFO] preparing ${VAGRANT_BOX}..." - vagrant up ${VAGRANT_BOX} 2> /dev/null + vagrant up --provision ${VAGRANT_BOX} 2> /dev/null if [ $? -ne 0 ]; then # box not enabled continue