From bdf0238328b7ca999225c616eada2a59441401e9 Mon Sep 17 00:00:00 2001
From: Victor Morales <v.morales@samsung.com>
Date: Tue, 4 Aug 2020 05:24:19 -0700
Subject: [PATCH] Upgrade molecule to v3 (#6468)

Signed-off-by: Victor Morales <v.morales@samsung.com>
---
 .../molecule/default/{playbook.yml => converge.yml}        | 0
 roles/bootstrap-os/molecule/default/molecule.yml           | 7 +++----
 .../molecule/default/{playbook.yml => converge.yml}        | 0
 .../containerd/molecule/default/molecule.yml               | 7 +++----
 .../cri-o/molecule/default/{playbook.yml => converge.yml}  | 0
 roles/container-engine/cri-o/molecule/default/molecule.yml | 7 +++----
 .../docker/molecule/default/{playbook.yml => converge.yml} | 0
 .../container-engine/docker/molecule/default/molecule.yml  | 7 +++----
 tests/requirements.txt                                     | 4 +++-
 9 files changed, 15 insertions(+), 17 deletions(-)
 rename roles/bootstrap-os/molecule/default/{playbook.yml => converge.yml} (100%)
 rename roles/container-engine/containerd/molecule/default/{playbook.yml => converge.yml} (100%)
 rename roles/container-engine/cri-o/molecule/default/{playbook.yml => converge.yml} (100%)
 rename roles/container-engine/docker/molecule/default/{playbook.yml => converge.yml} (100%)

diff --git a/roles/bootstrap-os/molecule/default/playbook.yml b/roles/bootstrap-os/molecule/default/converge.yml
similarity index 100%
rename from roles/bootstrap-os/molecule/default/playbook.yml
rename to roles/bootstrap-os/molecule/default/converge.yml
diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml
index 75b6f0f02..081d929e8 100644
--- a/roles/bootstrap-os/molecule/default/molecule.yml
+++ b/roles/bootstrap-os/molecule/default/molecule.yml
@@ -1,10 +1,9 @@
 ---
 dependency:
   name: galaxy
-lint:
-  name: yamllint
-  options:
-    config-file: ../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../.yamllint .
 driver:
   name: vagrant
   provider:
diff --git a/roles/container-engine/containerd/molecule/default/playbook.yml b/roles/container-engine/containerd/molecule/default/converge.yml
similarity index 100%
rename from roles/container-engine/containerd/molecule/default/playbook.yml
rename to roles/container-engine/containerd/molecule/default/converge.yml
diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml
index a6bb80e9c..b49d73ce0 100644
--- a/roles/container-engine/containerd/molecule/default/molecule.yml
+++ b/roles/container-engine/containerd/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../../.yamllint .
 platforms:
   - name: ubuntu18
     box: generic/ubuntu1804
diff --git a/roles/container-engine/cri-o/molecule/default/playbook.yml b/roles/container-engine/cri-o/molecule/default/converge.yml
similarity index 100%
rename from roles/container-engine/cri-o/molecule/default/playbook.yml
rename to roles/container-engine/cri-o/molecule/default/converge.yml
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index 06517b625..e2132134d 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-o/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../../.yamllint .
 platforms:
   - name: ubuntu1804
     box: generic/ubuntu1804
diff --git a/roles/container-engine/docker/molecule/default/playbook.yml b/roles/container-engine/docker/molecule/default/converge.yml
similarity index 100%
rename from roles/container-engine/docker/molecule/default/playbook.yml
rename to roles/container-engine/docker/molecule/default/converge.yml
diff --git a/roles/container-engine/docker/molecule/default/molecule.yml b/roles/container-engine/docker/molecule/default/molecule.yml
index 689649e1a..eaf6fae50 100644
--- a/roles/container-engine/docker/molecule/default/molecule.yml
+++ b/roles/container-engine/docker/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../../.yamllint .
 platforms:
   - name: kubespray-docker
     box: generic/ubuntu1804
diff --git a/tests/requirements.txt b/tests/requirements.txt
index c9782264f..651990756 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -6,5 +6,7 @@ dopy==0.3.7
 cryptography==2.8
 ansible-lint==4.2.0
 openshift==0.8.8
-molecule==2.22
+molecule==3.0.6
+molecule-vagrant==0.3
+testinfra==5.2.2
 python-vagrant==0.5.15