From cfd9ea5d565d9cd6791447d19123d4b5e2e52556 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 19 Jun 2022 19:59:04 -0500
Subject: [PATCH] Back to macOS for virtualbox (#10)

---
 .github/workflows/test.yml                          | 13 ++++++-------
 ansible/roles/init/molecule/ubuntu18/molecule.yml   |  9 ---------
 ansible/roles/init/molecule/ubuntu20/molecule.yml   |  7 +++++++
 .../init/molecule/{ubuntu18 => ubuntu20}/verify.yml |  0
 4 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 ansible/roles/init/molecule/ubuntu18/molecule.yml
 create mode 100644 ansible/roles/init/molecule/ubuntu20/molecule.yml
 rename ansible/roles/init/molecule/{ubuntu18 => ubuntu20}/verify.yml (100%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ac59205..27afbf2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,7 +57,7 @@ jobs:
           ubuntu = json.loads('${{ steps.collection.outputs.tox-envs }}')
           macos  = json.loads('${{ steps.vagrant.outputs.tox-envs }}')
           ub_zip = [{'os': 'ubuntu-22.04', 'scenario': u} for u in ubuntu]
-          mac_zip = [{'os': 'ubuntu-22.04', 'scenario': m} for m in macos]
+          mac_zip = [{'os': 'macos-12', 'scenario': m} for m in macos]
           print("::set-output name=scenarios::" + json.dumps(ub_zip + mac_zip))
 
   lint:
@@ -86,19 +86,18 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
       - uses: ./.github/actions/install_packer
-      - name: Install libvirt
+      - name: Container setup
         shell: bash
+        if: ${{ startsWith(matrix.scenarios.os, 'ubuntu') }}
         run: |
           set -exo pipefail
-          sudo apt-get install libvirt-daemon-system
-          sudo usermod -a -G libvirt $USER
-          sudo systemctl start libvirtd
-          sudo ls -la /var/run/libvirt/
+          # Enable cgroupv2 systemd stuff
+          sudo loginctl enable-linger 1001
       - name: Run scenario
         run: |
           set -ex
           TOX="$(which tox)"
-          sudo -E su -m -c "groups && ${TOX} -e \"${{ matrix.scenarios.scenario }}\" -- --destroy=never" $USER
+          ${TOX} -e "${{ matrix.scenarios.scenario }}" -- --destroy=never
       - name: Get possible output
         if: ${{ failure() }}
         run: |
diff --git a/ansible/roles/init/molecule/ubuntu18/molecule.yml b/ansible/roles/init/molecule/ubuntu18/molecule.yml
deleted file mode 100644
index 237c916..0000000
--- a/ansible/roles/init/molecule/ubuntu18/molecule.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-driver:
-  name: vagrant
-  provider:
-    name: libvirt
-platforms:
-  - name: test-ubuntu18-init
-    box: boxen/ubuntu-18.04-x86_64
-    provider_options:
-      driver: qemu
diff --git a/ansible/roles/init/molecule/ubuntu20/molecule.yml b/ansible/roles/init/molecule/ubuntu20/molecule.yml
new file mode 100644
index 0000000..2f73a46
--- /dev/null
+++ b/ansible/roles/init/molecule/ubuntu20/molecule.yml
@@ -0,0 +1,7 @@
+driver:
+  name: vagrant
+  provider:
+    name: virtualbox
+platforms:
+  - name: test-ubuntu20-init
+    box: boxen/ubuntu-20.04-x86_64
diff --git a/ansible/roles/init/molecule/ubuntu18/verify.yml b/ansible/roles/init/molecule/ubuntu20/verify.yml
similarity index 100%
rename from ansible/roles/init/molecule/ubuntu18/verify.yml
rename to ansible/roles/init/molecule/ubuntu20/verify.yml