From 9fabd5a845102192819d48558e154dcb2a2bba25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Krawczyk?=
 <616047+kravietz@users.noreply.github.com>
Date: Sun, 8 Aug 2021 15:41:28 +0100
Subject: [PATCH] Use Molecule provisioned images

---
 .github/workflows/main.yml    | 22 +++++++++++-----------
 molecule/default/converge.yml |  4 +---
 molecule/default/molecule.yml | 15 ++++++++++-----
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d5442b0..b1ae0a3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,14 +12,14 @@ on:
 jobs:
   test:
     runs-on:  ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - image: centos
-            tag: latest
-          - image: debian
-            tag: latest
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     config:
+    #       - image: centos
+    #         tag: latest
+    #       - image: debian
+    #         tag: latest
     steps:
 
       - name: checkout
@@ -29,6 +29,6 @@ jobs:
 
       - name: molecule
         uses: robertdebock/molecule-action@2.6.17
-        with:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
\ No newline at end of file
+        # with:
+        #   image: ${{ matrix.config.image }}
+        #   tag: ${{ matrix.config.tag }}
\ No newline at end of file
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index f79c26f..40473ca 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -1,8 +1,6 @@
 ---
 - name: Converge
-  hosts: localhost
-  connection: local
-  become: yes
+  hosts: all
   gather_facts: yes
   roles:
     - role: ipr-cnrs.nftables
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index b5e2b94..ddd57d9 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,11 +8,16 @@ lint: |
 driver:
   name: docker
 platforms:
-  - name: "nftables-${image:-debian}-${tag:-latest}"
-    image: "${image:-debian}:${tag:-latest}"
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: ubuntu-latest
+    image: ubuntu:latest
+  - name: centos-latest
+    image: centos-latest
+  # - name: "nftables-${image:-debian}-${tag:-latest}"
+  #   image: "${image:-debian}:${tag:-latest}"
+    # command: /lib/systemd/systemd
+    # privileged: true
+    # volumes:
+    #   - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
 verifier: