Propagate changes from cloudalchemy roles (#52)

* more efficient checksum handling; clearer CPU architecture management

* align test-requirements with cloudalchemy/skeleton

* do not change default user and group in default test scenario

* add "latest" test scenario

* add tags

* specify which parts need elevated privileges

* fix tests

* [minor] release

Author: paulfantom

.travis.yml

@@ -8,10 +8,12 @@ env:
   - ANSIBLE=2.5
   - ANSIBLE=2.6
   - ANSIBLE=2.7
+matrix:
+  fast_finish: true
 install:
   - pip install tox-travis git-semver
 script:
-  - tox
+  - ./.travis/test.sh
 deploy:
   provider: script
   skip_cleanup: true

.travis/test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+	tox -- molecule test --all
+else
+	tox -- molecule test -s default --destroy always
+	tox -- molecule test -s alternative --destroy never
+fi

README.md

@@ -59,7 +59,6 @@ For example, if you have a restic repository named `testrepo`, you could use the
 Use it in a playbook as follows:
 ```yaml
 - hosts: all
-  become: yes
   roles:
     - paulfantom.restic
 ```

molecule/alternative/playbook.yml

@@ -5,7 +5,6 @@
   roles:
     - ansible-restic
   vars:
-    restic_version: 'latest'
     restic_user: restic
     restic_group: restic
     restic_install_path: "/opt"

molecule/default/playbook.yml

@@ -5,8 +5,6 @@
   roles:
     - ansible-restic
   vars:
-    restic_user: restic
-    restic_group: restic
     restic_repos:
       - name: local-example
         url: "/tmp/restic"

molecule/latest/molecule.yml

@@ -0,0 +1,36 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: stretch
+    image: paulfantom/debian-molecule:9
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: fedora
+    image: paulfantom/fedora-molecule:27
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../default/create.yml
+    prepare: ../default/prepare.yml
+    converge: playbook.yml
+    destroy: ../default/destroy.yml
+scenario:
+  name: latest
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+    enabled: true

molecule/latest/playbook.yml

@@ -0,0 +1,27 @@
+---
+- name: Default use-case scenario
+  hosts: all
+  any_errors_fatal: true
+  roles:
+    - ansible-restic
+  vars:
+    restic_version: latest
+    restic_user: restic
+    restic_group: restic
+    restic_repos:
+      - name: local-example
+        url: "/tmp/restic"
+        password: "correcthorsebatterystaple"
+        jobs:
+          - command: 'restic backup /srv'
+            at: '0 1  * * *'
+        retention_time: '17 5 * * *'
+        retention:
+          last: 2
+          hourly: 4
+          weekly: 9
+          monthly: 3
+          yearly: 10
+          tags:
+            - special
+            - test

molecule/latest/tests/test_alternative.py

@@ -0,0 +1,12 @@
+import os
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_binary(host):
+    binary = host.file("/usr/local/bin/restic")
+    assert binary.exists
+    assert binary.is_file
+    assert binary.mode == 0o750

tasks/install.yml

@@ -48,25 +48,25 @@
 - name: Download client binary
   become: false
   get_url:
-    url: "https://github.com/restic/restic/releases/download/v{{ restic_version }}/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.bz2"
-    dest: "/tmp/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.bz2"
+    url: "https://github.com/restic/restic/releases/download/v{{ restic_version }}/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ go_arch }}.bz2"
+    dest: "/tmp/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ go_arch }}.bz2"
     checksum: "sha256:{{ restic_checksum }}"
   delegate_to: localhost
   run_once: true
   check_mode: false
 
 - name: Decompress the binary
   become: false
-  shell: "bzip2 -dc /tmp/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.bz2 > /tmp/restic_{{ restic_version }}_{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
+  shell: "bzip2 -dc /tmp/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ go_arch }}.bz2 > /tmp/restic_{{ restic_version }}_{{ go_arch }}"
   args:
-    creates: "/tmp/restic_{{ restic_version }}_{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
+    creates: "/tmp/restic_{{ restic_version }}_{{ go_arch }}"
   delegate_to: localhost
   run_once: true
   check_mode: false
 
 - name: Propagate restic binary
   copy:
-    src: "/tmp/restic_{{ restic_version }}_{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
+    src: "/tmp/restic_{{ restic_version }}_{{ go_arch }}"
     dest: '{{ restic_install_path }}/restic'
     mode: '0750'
     owner: 'root'

tasks/main.yml

@@ -1,6 +1,15 @@
 ---
 - include: preflight.yml
+  tags:
+    - restic_install
+    - restic_configure
 
 - include: install.yml
+  become: true
+  tags:
+    - restic_install
 
 - include: configure.yml
+  become: true
+  tags:
+    - restic_configure

tasks/preflight.yml

@@ -19,9 +19,13 @@
       restic_version: "{{ _latest_release.json.tag_name[1:] }}"
   when: restic_version == "latest"
 
-- name: "Get checksum for {{ go_arch_map[ansible_architecture] | default(ansible_architecture) }} architecture"
+- name: Get checksum list from github
+  set_fact:
+    _checksums: "{{ lookup('url', 'https://github.com/restic/restic/releases/download/v' + restic_version + '/SHA256SUMS', wantlist=True) | list }}"
+  run_once: true
+
+- name: "Get checksum for {{ go_arch }} architecture"
   set_fact:
     restic_checksum: "{{ item.split(' ')[0] }}"
-  with_items:
-    - "{{ lookup('url', 'https://github.com/restic/restic/releases/download/v' + restic_version + '/SHA256SUMS', wantlist=True) | list }}"
-  when: "('restic_' + restic_version + '_linux_' + (go_arch_map[ansible_architecture] | default(ansible_architecture)) + '.bz2') in item"
+  with_items: "{{ _checksums }}"
+  when: "('restic_' + restic_version + '_linux_' + go_arch + '.bz2') in item"

test-requirements.txt

@@ -1,6 +1,5 @@
-ansible-lint>=3.4.0
-docker
-jmespath
 molecule>=2.15.0
-pytest==3.9.3
+docker
+ansible-lint>=3.4.0
 testinfra>=1.7.0
+jmespath

vars/main.yml

@@ -5,3 +5,5 @@ go_arch_map:
   aarch64: arm64
   armv7l: arm
   armv6l: arm
+
+go_arch: "{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"