Merge molecule default and ci scenarios (#27)

* Removed ansible pip package as it already exist on the GH runners * Remove workflow default working directory --------- Co-authored-by: Benjamin Cook <[email protected]>
bcook254 · May 13, 2024 · bdbed0e · bdbed0e
1 parent aee7ce6
commit bdbed0e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 123 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,10 +6,6 @@ name: ci
     branches:
       - main
 
-defaults:
-  run:
-    working-directory: 'bcook254.adguardhome'
-
 jobs:
 
   lint:
@@ -18,13 +14,6 @@ jobs:
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
-        with:
-          path: 'bcook254.adguardhome'
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
 
       - name: Install test dependencies.
         run: python -m pip install yamllint
@@ -33,7 +22,7 @@ jobs:
         run: yamllint .
 
   molecule:
-    name: Molecule Test
+    name: Molecule Test (${{ matrix.platform.name }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -64,21 +53,28 @@ jobs:
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
-        with:
-          path: 'bcook254.adguardhome'
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
 
       - name: Install test dependencies.
-        run: python -m pip install ansible molecule molecule-plugins[docker] docker
+        run: python -m pip install molecule molecule-plugins[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 }}
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
+
+  check:
+    name: Molecule Tests
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-latest
+    needs: [molecule]
+    steps:
+      - name: Exit on failure
+        if: ${{ needs.molecule.result == 'failure' }}
+        shell: bash
+        run: exit 1
+      - name: Exit
+        shell: bash
+        run: exit 0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,14 +19,6 @@ jobs:
         with:
           path: 'bcook254.adguardhome'
 
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install Ansible.
-        run: python3 -m pip install ansible-core
-
       - name: Trigger a new import on Galaxy.
         run: >-
           ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}

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