diff --git a/.travis.yml b/.travis.yml index abc583a44f62a169059b177cabed55bfe3ab9183..520f319b07f15c22c001eb8254b1aaf2fba7faa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,35 @@ language: python python: "2.7" dist: trusty -sudo: false +sudo: True group: beta services: [docker] +env: + - platform: openbsd + driver: vagrant + - platform: xenial + driver: vagrant + - platform: jessie + driver: vagrant + - platform: trusty + driver: vagrant cache: - pip - directories: - $HOME/.pre-commit install: + - sudo apt-get update + - sudo apt-get install -y linux-headers-$(uname -r) virtualbox + - wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb + - sudo dpkg -i vagrant_1.9.1_x86_64.deb - pip install -r tests/requirements.txt | cat - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles - molecule dependency script: - pre-commit run --all-files - - molecule test --driver docker + - molecule test --driver $driver --platform $platform notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/ansible.cfg b/ansible.cfg index 905e3c64897217cd1b88acde10920ae04c7c6011..a33a906b7db5fa209df2b129eff0b36c42f661d9 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -2,7 +2,7 @@ library = library host_key_checking = False retry_files_enabled = False -roles_path = .molecule/roles:.molecule/../roles:../:../../ +roles_path = ../:.molecule/roles:.molecule/../roles:../../ command_warnings = True deprecation_warnings = True callback_whitelist = profile_tasks diff --git a/molecule.yml b/molecule.yml index 836f762ef173cf09524dc17c7c4425dd47cb0b80..93b80739c679fe3d1e828cff5cdb4e592c8c33f9 100644 --- a/molecule.yml +++ b/molecule.yml @@ -13,24 +13,30 @@ vagrant: providers: - name: virtualbox type: virtualbox + options: + cpus: 1 platforms: - name: openbsd - box: kaorimatz/openbsd-6.0-amd64 - - name: jessie - box: debian/jessie64 + box: fnichol/openbsd-6.0-i386 - name: xenial - box: ubuntu/xenial64 + box: ubuntu/xenial32 + - name: jessie + box: nogajun/jessie32 - name: trusty - box: ubuntu/trusty64 + box: ubuntu/trusty32 instances: - name: gitreceive options: append_platform_to_hostname: yes raw_config_args: - 'vm.synced_folder ".", "/vagrant", disabled: true' - - 'vbguest.auto_update = false' - - 'landrush.enabled = false' - - 'landrush_ip.override = false' + - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")' + - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")' + - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")' + - | + vm.provider "virtualbox" do |v| + v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"] + end docker: containers: diff --git a/tests/playbook.yml b/tests/playbook.yml index eac28b9d7b51db4ebf6ca8109e51ae67149d8726..8db34c0a00c279234efd1640c9c2f77d5c3d2236 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -1,11 +1,11 @@ --- - hosts: gitreceive-openbsd gather_facts: false - roles: [adarnimrod.openbsd-bootstrap] + roles: [openbsd-bootstrap] - hosts: gitreceive-xenial gather_facts: false - roles: [adarnimrod.debian-bootstrap] + roles: [debian-bootstrap] - hosts: all tasks: @@ -29,7 +29,6 @@ state: started - hosts: all - strategy: free roles: - role: gitreceive gitreceive_public_keys: ['{{ lookup("file", "id_rsa.pub") }}'] diff --git a/tests/requirements.txt b/tests/requirements.txt index b9dd3357849815f2a92024577fb91a51616cb9da..f222e79fb237292bf6403d90bcf0a54a1709f450 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,8 +1,11 @@ ansible==2.2.0.0 -testinfra==1.4.5 -molecule==1.16.1 -ansible-lint==3.4.7 +testinfra==1.5.1 +molecule==1.17.3 +ansible-lint==3.4.9 pre-commit==0.9.4 piprot==0.9.7 python-vagrant==0.5.14 docker-py==1.10.6 +netaddr==0.7.18 +passlib==1.7.0 +bcrypt==3.1.2 diff --git a/tests/requirements.yml b/tests/requirements.yml index cdc294cd67e8c5b70eed5178580e6edde25e10bb..70716f60b9e624bc5a09442517a08667363949f4 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -1,3 +1,5 @@ --- - src: adarnimrod.openbsd-bootstrap + name: openbsd-bootstrap - src: adarnimrod.debian-bootstrap + name: debian-bootstrap