Regenerated content.

robertdebock · Jul 1, 2024 · 3492f43 · 3492f43
1 parent da82e1a
commit 3492f43
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 110 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -33,8 +33,6 @@ jobs:
             tag: "latest"
           - image: "amazonlinux"
             tag: "latest"
-          - image: "enterpriselinux"
-            tag: "8"
           - image: "enterpriselinux"
             tag: "latest"
           - image: "debian"
@@ -47,8 +45,6 @@ jobs:
             tag: "latest"
           - image: "fedora"
             tag: "rawhide"
-          - image: "opensuse"
-            tag: "latest"
           - image: "ubuntu"
             tag: "latest"
           - image: "ubuntu"
@@ -58,18 +54,6 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-        # with:
-        #   path: "${{ github.repository }}"
-
-      - name: Debug
-        run: |
-          pwd
-          ls -la
-      # - name: molecule
-      #   uses: robertdebock/molecule-action@6.0.1
-      #   with:
-      #     image: ${{ matrix.config.image }}
-      #     tag: ${{ matrix.config.tag }}
 
       - name: Set up Python 3.
         uses: actions/setup-python@v5
@@ -82,92 +66,8 @@ jobs:
           # pip install molecule molecule-plugins[docker] docker ansible
           pip install -r requirements.txt
 
-      - name: python | version
-        run: python --version
-
-      - name: docker | ps
-        run: docker ps -a
-
-      - name: molecule | create
-        run: molecule create
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: docker | ps
-        run: docker ps -a
-
-      - name: docker | inspect
-        run: docker inspect $(docker ps -qa)
-
-      - name: molecule | list
-        run: molecule list
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: molecule | prepare
-        run: molecule prepare
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: docker | ps
-        run: docker ps -a
-
-      - name: molecule | list
-        run: molecule list
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: molecule | converge
+      - name: molecule
         run: molecule converge
         env:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}
-
-      - name: docker | ps
-        run: docker ps -a
-
-      - name: molecule | list
-        run: molecule list
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: molecule | idempotence
-        run: molecule idempotence
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: docker | ps
-        run: docker ps -a
-
-      - name: molecule | list
-        run: molecule list
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: molecule | verify
-        run: molecule verify
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: docker | ps
-        run: docker ps -a
-
-      - name: molecule | list
-        run: molecule list
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-
-      - name: molecule | destroy
-        run: molecule destroy
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -16,8 +16,6 @@ molecule:
         tag: "latest"
       - image: "amazonlinux"
         tag: "latest"
-      - image: "enterpriselinux"
-        tag: "8"
       - image: "enterpriselinux"
         tag: "latest"
       - image: "debian"
@@ -30,8 +28,6 @@ molecule:
         tag: "latest"
       - image: "fedora"
         tag: "rawhide"
-      - image: "opensuse"
-        tag: "latest"
       - image: "ubuntu"
         tag: "latest"
       - image: "ubuntu"

diff --git a/README.md b/README.md
@@ -71,7 +71,6 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|all|
 |[Debian](https://hub.docker.com/r/robertdebock/debian)|all|
 |[Fedora](https://hub.docker.com/r/robertdebock/fedora)|all|
-|[opensuse](https://hub.docker.com/r/robertdebock/opensuse)|all|
 |[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|all|
 
 The minimum version of Ansible required is 2.12, tests have been done to:

diff --git a/meta/main.yml b/meta/main.yml
@@ -23,9 +23,9 @@ galaxy_info:
     - name: Fedora
       versions:
         - all
-    - name: opensuse
-      versions:
-        - all
+    # - name: opensuse
+    #   versions:
+    #     - all
     - name: Ubuntu
       versions:
         - all

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -21,7 +21,6 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
-    cgroupns_mode: host
 provisioner:
   name: ansible
 verifier: