From 77d62c3aa9f5ac9811f7da7ddf5839c324021a0e Mon Sep 17 00:00:00 2001
From: Ranabir Chakraborty <rchakrab@redhat.com>
Date: Thu, 23 May 2024 18:35:11 +0530
Subject: [PATCH] Implementing the CI fix

---
 .github/workflows/ci.yml      | 42 +++++++----------------------------
 molecule/account/molecule.yml |  5 -----
 molecule/cron/molecule.yml    |  5 -----
 3 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7d20c5..a2746b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,19 +12,23 @@ jobs:
     name: molecule
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: ['3.11']
+
     steps:
       - name: Checkout the codebase.
         uses: actions/checkout@v2
 
-      - name: Set up Python3.
+      - name: Set up Python ${{ matrix.python_version }}
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: ${{ matrix.python_version }}
 
       - name: Install testing dependencies.
         run: |
           python -m pip install --upgrade pip
-          pip install yamllint 'molecule>=4.0.4' 'molecule-plugins[podman]>=23.0.0' ansible-core flake8 ansible-lint voluptuous
+          pip install yamllint 'molecule>=6.0.3' 'molecule-plugins[podman]>=23.0.0' 'ansible-core<2.16' flake8 ansible-lint voluptuous
           ansible-galaxy collection install -r requirements.yml
 
       - name: Run linter
@@ -32,40 +36,10 @@ jobs:
           ansible-lint --version
           ansible-lint -v
 
-      - name: Set up Python ${{ matrix.python_version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python_version }}
-          cache: 'pip'
-
-      - name: Install ansible and molecule
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 5
-          retry_wait_seconds: 60
-          max_attempts: 3
-          command: |
-            python -m pip install --upgrade pip
-            pip install --progress-bar off 'molecule>=5.0.1' 'molecule-plugins[docker]>=23.0.0' ansible-core==${{ matrix.ansible_version }}
-            if [ -f ansible_collections/${{ inputs.fqcn }}/requirements.txt ]; then
-              echo "=== Installing python deps"
-              pip install --progress-bar off -r ansible_collections/${{ inputs.fqcn }}/requirements.txt
-            fi
-            if [ -f ansible_collections/${{ inputs.fqcn }}/requirements.yml ]; then
-              echo "=== Installing dependencies"
-              ansible-galaxy collection install -r ansible_collections/${{ inputs.fqcn }}/requirements.yml -p /home/runner/.ansible/collections --force-with-deps
-            fi
-            if [ -f ansible_collections/${{ inputs.fqcn }}/molecule/requirements.yml ]; then
-              echo "=== Installing test dependencies"
-              ansible-galaxy role install -r ansible_collections/${{ inputs.fqcn }}/molecule/requirements.yml ||:
-              ansible-galaxy collection install -r ansible_collections/${{ inputs.fqcn }}/molecule/requirements.yml -p /home/runner/.ansible/collections
-            fi
-            exit 0
-
       - name: "Run molecule tests"
         run: molecule test --all
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
-          MOLECULE_DISTRO: rhel-8
+          MOLECULE_DISTRO: rhel-9
         working-directory: '.'
diff --git a/molecule/account/molecule.yml b/molecule/account/molecule.yml
index dadc01e..61fe815 100644
--- a/molecule/account/molecule.yml
+++ b/molecule/account/molecule.yml
@@ -11,11 +11,6 @@ platforms:
       - sudo
 provisioner:
   name: ansible
-  config_options:
-    defaults:
-      interpreter_python: auto_silent
-    ssh_connection:
-      pipelining: false
   playbooks:
     prepare: prepare.yml
     converge: converge.yml
diff --git a/molecule/cron/molecule.yml b/molecule/cron/molecule.yml
index c2a09a3..1380acb 100644
--- a/molecule/cron/molecule.yml
+++ b/molecule/cron/molecule.yml
@@ -11,11 +11,6 @@ platforms:
       - sudo
 provisioner:
   name: ansible
-  config_options:
-    defaults:
-      interpreter_python: auto_silent
-    ssh_connection:
-      pipelining: false
   playbooks:
     converge: converge.yml
     verify: verify.yml