github actions updates

jvoss · Feb 17, 2023 · ac1a249 · ac1a249
1 parent 6fcb273
commit ac1a249
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       matrix:
         distro:
-          - amazonlinux2
+          # - amazonlinux2
           - centos8
           - debian11
           - rockylinux8

diff --git a/.github/workflows/netbox.yml b/.github/workflows/netbox.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         distro:
-          - amazonlinux2
+          # - amazonlinux2
           - centos8
           - debian10
           - debian11

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -13,18 +13,13 @@ lint: |
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
-<<<<<<< HEAD
     command: ${MOLECULE_DOCKER_COMMAND:-""}
-=======
-    command: ${MOLECULE_DOCKER_COMMAND:-"/sbin/init"}
-    capabilities:
-      - SYS_ADMIN
->>>>>>> 317e9fe... squash
+    cgroupns_mode: host
     network_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
 
 provisioner:
   name: ansible