diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 01fddc124d989670b28af4212074fe0183bdbc90..09c5ff92617f961983dba06904ed6ac692ea2bec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,6 +34,6 @@ name: piprot description: Check up-to-date Python requirements language: system - entry: piprot --quiet --outdated tests/requirements.txt + entry: piprot --outdated tests/requirements.txt files: requirements.txt always_run: true diff --git a/.travis.yml b/.travis.yml index b6502e54a81be24b4c391b7fb5dc4305bb6832a4..14032a04828696b90bdcb20c0d1320460a9e7958 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: ["2.7", "3.4"] +python: ["2.7", "3.5"] dist: trusty sudo: True group: beta @@ -14,7 +14,7 @@ env: matrix: fast_finish: True allow_failures: - - python: "3.4" + - python: "3.5" - env: *openbsd59 cache: - pip diff --git a/molecule.yml b/molecule.yml index 44143a7f2d9b4158d63d0f6cd3c53f12565cd18f..bbee0b115ccd4604b12086c62dda14d48913fd26 100644 --- a/molecule.yml +++ b/molecule.yml @@ -24,10 +24,12 @@ vagrant: box: ubuntu/xenial32 - name: trusty box: ubuntu/trusty32 + - name: precise + box: hashicorp/precise32 - name: jessie - box: debian/jessie32 + box: deb/jessie-i386 - name: wheezy - box: debian/wheezy32 + box: bmorg/debian-wheezy-i386 instances: - name: gitreceive options: @@ -62,6 +64,12 @@ docker: environment: DEBIAN_FRONTEND: noninteractive container: docker + - name: gitreceive-precise + image: ubuntu + image_version: precise + environment: + DEBIAN_FRONTEND: noninteractive + container: docker - name: gitreceive-jessie image: debian image_version: jessie @@ -77,7 +85,6 @@ docker: - name: gitreceive-wheezy image: debian image_version: wheezy - command: /sbin/init environment: DEBIAN_FRONTEND: noninteractive container: docker diff --git a/tests/playbook.yml b/tests/playbook.yml index 5559261afda34e62e5701776b62d9d97e0a08c7c..19ed3511745b4f2b8a671b68c780e3229813a8bb 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -1,11 +1,21 @@ --- - hosts: gitreceive-openbsd* gather_facts: false - roles: [openbsd-bootstrap] + roles: + - openbsd-bootstrap + - role: users + users: [] + users_use_sudo: True + users_lock_root_ssh: False -- hosts: gitreceive-xenial +- hosts: [gitreceive-xenial, gitreceive-wheezy] gather_facts: false - roles: [debian-bootstrap] + roles: + - debian-bootstrap + - role: users + users: [] + users_use_sudo: True + users_lock_root_ssh: False - hosts: all tasks: diff --git a/tests/requirements.txt b/tests/requirements.txt index 1c8ea361c0af0ec637c22c71f1acdb9cd22295a0..f4cbfddce2bfb1c4aed0a59c2b32325c4f83b433 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,11 +1,11 @@ -ansible==2.2.0.0 -testinfra==1.5.1 -molecule==1.17.3 -ansible-lint==3.4.9 -pre-commit==0.10.1 +ansible==2.2.1.0 +testinfra==1.5.2 +molecule==1.19.0 +ansible-lint==3.4.10 +pre-commit==0.11.0 piprot==0.9.7 python-vagrant==0.5.14 docker-py==1.10.6 -netaddr==0.7.18 +netaddr==0.7.19 passlib==1.7.0 bcrypt==3.1.2 diff --git a/tests/requirements.yml b/tests/requirements.yml index 70716f60b9e624bc5a09442517a08667363949f4..fccce7574df98d466c55a309273c4060174e8cb0 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -3,3 +3,5 @@ name: openbsd-bootstrap - src: adarnimrod.debian-bootstrap name: debian-bootstrap +- src: adarnimrod.users + name: users