Merge branch 'main' into pre-commit-ci-update-config

Author: ssbarnea

.gitignore

@@ -131,3 +131,10 @@ src/molecule_plugins/_version.py
 
 # Ignore generated files
 test/roles
+
+# Quilt/Patch generated files
+.pc
+patches
+*.patch
+*.orig
+*.rej

molecule/test-podman/molecule.yml

@@ -5,7 +5,7 @@ driver:
   name: podman
 platforms:
   - name: instance
-    image: docker.io/pycontribs/centos:8
+    image: quay.io/centos/centos:stream9
     pre_build_image: true
     published_ports:
       - 127.0.0.1:2080:80

src/molecule_plugins/docker/playbooks/validate-dockerfile.yml

@@ -9,7 +9,7 @@
       # platforms supported as being managed by molecule/ansible, this does
       # not mean molecule itself can run on them.
       - image: alpine:edge
-      - image: quay.io/centos/centos:stream8
+      - image: quay.io/centos/centos:stream9
       - image: ubuntu:latest
       - image: debian:latest
   tags:

src/molecule_plugins/podman/playbooks/validate-dockerfile.yml

@@ -9,14 +9,13 @@
       # platforms supported as being managed by molecule/ansible, this does
       # not mean molecule itself can run on them.
       - image: alpine:edge
-      - image: centos:7
-      # - image: centos:8
+      - image: quay.io/centos/centos:stream9
       - image: ubuntu:latest
       - image: debian:latest
   tasks:
     - name: Create isolated build directories for each image
       ansible.builtin.tempfile:
-        prefix: "molecule-dockerfile-{{ item.image }}"
+        prefix: "molecule-dockerfile-{{ item.image | replace('/', '-') }}"
         state: directory
       register: temp_image_dirs
       with_items: "{{ platforms }}"

test/azure/functional/test_azure.py

@@ -76,6 +76,9 @@ def test_azure_command_init_scenario(temp_dir):
 
         assert os.path.isdir(scenario_directory)
 
+        os.unlink(os.path.join(scenario_directory, "create.yml"))
+        os.unlink(os.path.join(scenario_directory, "destroy.yml"))
+
         # temporary trick to pass on CI/CD
         if "AZURE_SECRET" in os.environ:
             cmd = ["molecule", "test", "-s", "test-scenario"]

test/docker/scenarios/env-substitution/molecule/default/molecule.yml

@@ -3,7 +3,7 @@ driver:
   name: docker
 platforms:
   - name: instance-${DOES_NOT_EXIST:-local}
-    image: ${MOLECULE_ROLE_IMAGE:-centos:7}
+    image: ${MOLECULE_ROLE_IMAGE:-quay.io/centos/centos:stream9}
     pre_build_image: false
 provisioner:
   name: ansible

test/ec2/functional/test_ec2.py

@@ -51,6 +51,8 @@ def test_ec2_command_init_scenario(temp_dir):
         assert run_command(cmd).returncode == 0
 
         assert os.path.isdir(scenario_directory)
+        os.unlink(os.path.join(scenario_directory, "create.yml"))
+        os.unlink(os.path.join(scenario_directory, "destroy.yml"))
 
         cmd = ["molecule", "test", "-s", "test-scenario"]
         assert run_command(cmd).returncode == 0

test/gce/functional/test_func.py

@@ -55,6 +55,8 @@ def test_gce_command_init_scenario(temp_dir):
         assert run_command(cmd).returncode == 0
 
         assert os.path.isdir(scenario_directory)
+        os.unlink(os.path.join(scenario_directory, "create.yml"))
+        os.unlink(os.path.join(scenario_directory, "destroy.yml"))
 
         cmd = ["molecule", "test", "-s", "test-scenario"]
         assert run_command(cmd).returncode == 0

test/openstack/test_func.py

@@ -57,6 +57,8 @@ def test_openstack_init_and_test_scenario(tmp_path: pathlib.Path, DRIVER: str) -
         assert result.returncode == 0
 
         assert scenario_directory.exists()
+        os.unlink(os.path.join(scenario_directory, "create.yml"))
+        os.unlink(os.path.join(scenario_directory, "destroy.yml"))
 
         confpath = os.path.join(scenario_directory, "molecule.yml")
         testconf = os.path.join(