diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a1fa490069bae414848cd9cc6b5f2450d108d638..bd9a4d714377ea51d2cd14419ae059cc9307b5d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ - repo: https://github.com/pre-commit/pre-commit-hooks - sha: 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469 + sha: v0.7.1 hooks: - id: check-added-large-files - id: check-json @@ -9,27 +9,15 @@ - id: flake8 - id: check-symlinks - repo: https://github.com/adarnimrod/ansible-pre-commit.git - sha: v0.5.0 + sha: v0.6.0 hooks: - id: ansible-syntax-check - always_run: true - files: tests/playbook.yml - args: - - tests/playbook.yml - repo: https://github.com/willthames/ansible-lint - sha: 959ab0f525e9abb19cf75f34381015cf33695f61 + sha: v3.4.12 hooks: - id: ansible-lint - always_run: true files: tests/playbook.yml - args: - - tests/playbook.yml -- repo: local +- repo: https://github.com/adarnimrod/python-pre-commit.git + sha: v0.2.0 hooks: - id: piprot - name: piprot - description: Check up-to-date Python requirements - language: system - entry: piprot --outdated tests/requirements.txt - files: requirements.txt - always_run: true diff --git a/.travis.yml b/.travis.yml index 160564e72d132cf7953cfc6fb69eae200c3329f8..7f988017da52d46c54a0c409f86520ef3736fbe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,12 @@ dist: trusty sudo: True group: beta env: - - platform: openbsd60 - - &openbsd59 platform=openbsd59 - - platform: openbsd56 + global: + - VBOX_MEMORY=2048 + matrix: + - platform: openbsd60 + - &openbsd59 platform=openbsd59 + - platform: openbsd56 matrix: fast_finish: True allow_failures: @@ -29,8 +32,9 @@ install: script: - pre-commit run --all-files - - molecule test --platform $platform + - travis_wait 45 molecule test --platform $platform notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ email: false + on_failure: never diff --git a/molecule.yml b/molecule.yml index d89bc42eaf90f5cfd16979cbe950f633d8cd7269..626b845c3199a8316f877e7114497d6a55e11332 100644 --- a/molecule.yml +++ b/molecule.yml @@ -31,4 +31,5 @@ vagrant: - | vm.provider "virtualbox" do |v| v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"] + v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY') end diff --git a/tests/requirements.txt b/tests/requirements.txt index 72315d11aeeca07ed7211f17943b28226df4cb59..57c94d957f72c9d89286e5275edda7bf2932707b 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,10 +1,9 @@ -ansible==2.2.1.0 -testinfra==1.5.3 -molecule==1.19.3 -ansible-lint==3.4.10 -pre-commit==0.12.2 -piprot==0.9.7 +ansible==2.3.0.0 +testinfra==1.5.5 +molecule==1.23.2 +ansible-lint==3.4.12 +pre-commit==0.13.6 python-vagrant==0.5.14 netaddr==0.7.19 passlib==1.7.1 -bcrypt==3.1.2 +bcrypt==3.1.3