Merge molecule default and ci scenarios

bcook254 · May 13, 2024 · 98e8c7e · 98e8c7e
1 parent aee7ce6
commit 98e8c7e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 95 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
         run: python -m pip install ansible molecule molecule-plugins[docker] docker
 
       - name: Run Molecule tests.
-        run: molecule test --driver-name docker --scenario-name ci
+        run: molecule test --driver-name docker
         env:
           PLATFORM_NAME: ${{ matrix.platform.name }}
           PLATFORM_IMAGE: ${{ matrix.platform.image }}

diff --git a/molecule/ci/converge.yml b/molecule/ci/converge.yml
diff --git a/molecule/ci/molecule.yml b/molecule/ci/molecule.yml
diff --git a/molecule/ci/prepare.yml b/molecule/ci/prepare.yml
diff --git a/molecule/ci/requirements.yml b/molecule/ci/requirements.yml
diff --git a/molecule/ci/verify.yml b/molecule/ci/verify.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -6,8 +6,8 @@ dependency:
 driver:
   name: podman
 platforms:
-  - name: ${MOLECULE_DISTRO:-ubuntu2404}
-    image: docker.io/geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2404}-ansible:latest
+  - name: ${PLATFORM_NAME:-ubuntu2404}
+    image: ${PLATFORM_IMAGE:-"docker.io/geerlingguy/docker-ubuntu2404-ansible:latest"}
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw