From 0572adecafe201be574c652ae07ef391a8eb2911 Mon Sep 17 00:00:00 2001
From: jgoutin <jgoutin@accelize.com>
Date: Mon, 30 Mar 2020 09:33:16 +0200
Subject: [PATCH] Fix idempotency, update to molecule 3

---
 .travis.yml                                     |  2 +-
 molecule/default/{playbook.yml => converge.yml} |  0
 molecule/default/molecule.yml                   | 15 +++------------
 tasks/main.yml                                  |  1 +
 4 files changed, 5 insertions(+), 13 deletions(-)
 rename molecule/default/{playbook.yml => converge.yml} (100%)

diff --git a/.travis.yml b/.travis.yml
index 4684730..78c0c68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/molecule/default/playbook.yml b/molecule/default/converge.yml
similarity index 100%
rename from molecule/default/playbook.yml
rename to molecule/default/converge.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index b3e6e02..ecd0bbf 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,10 +3,10 @@
 
 dependency:
   name: galaxy
+
 driver:
   name: docker
-lint:
-  name: yamllint
+
 platforms:
   - name: ubuntu_bionic
     image: ubuntu:bionic
@@ -14,9 +14,6 @@ platforms:
   - 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
@@ -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:
@@ -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
diff --git a/tasks/main.yml b/tasks/main.yml
index 58e40ff..1ec92ac 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -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