Skip to content
This repository has been archived by the owner on Feb 28, 2023. It is now read-only.

Commit

Permalink
Fix idempotency, update to molecule 3
Browse files Browse the repository at this point in the history
  • Loading branch information
JGoutin committed Mar 30, 2020
1 parent 1fee0ce commit 0572ade
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ language: python
services: docker

install:
- pip install molecule[docker] --pre
- pip install molecule[docker] testinfra yamllint ansible-lint

script:
- molecule test
Expand Down
File renamed without changes.
15 changes: 3 additions & 12 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@

dependency:
name: galaxy

driver:
name: docker
lint:
name: yamllint

platforms:
- name: ubuntu_bionic
image: ubuntu:bionic
privileged: true
- name: ubuntu_bionic_deps
image: ubuntu:bionic
privileged: true
- name: ubuntu_latest
image: ubuntu:latest
privileged: true
- name: centos_7
image: centos:7
privileged: true
Expand All @@ -26,14 +23,9 @@ platforms:
- name: centos_7_deps
image: centos:7
privileged: true
- name: fedora_30
image: fedora:30
privileged: true

provisioner:
name: ansible
lint:
name: ansible-lint
inventory:
host_vars:
centos_7:
Expand All @@ -59,7 +51,6 @@ provisioner:
accelize_drm_build_package: true
accelize_drm_coverage: true
accelize_drm_abi_check: true

verifier:
name: testinfra
lint:
name: flake8
1 change: 1 addition & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@

- name: Ensure Pip is up to date
command: "python3 -m pip install -U pip {{ _pip_args }}"
changed_when: false
when: (accelize_drm_from_source | bool) or (accelize_drm_build | bool)

- name: Ensure CMake is installed
Expand Down

0 comments on commit 0572ade

Please sign in to comment.