Merge branch 'main' into feature/molecule-gce-additional-disks

Author: dfisiuk

src/molecule_plugins/docker/driver.py

@@ -255,7 +255,11 @@ def sanity_checks(self):
         self._passed_sanity = True
 
     def reset(self):
-        import docker
+        # maybe use self.sanity_check instead?
+        try:
+            import docker
+        except ImportError:
+            return
 
         client = docker.from_env()
         for c in client.containers.list(filters={"label": "owner=molecule"}):

src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml

@@ -21,6 +21,7 @@
         subnetwork:
           selfLink: "{{ gcp_snet }}"
         access_configs: "{{ [{'name': 'instance_ip', 'type': 'ONE_TO_ONE_NAT'}] if molecule_yml.driver.external_access else [] }}"
+    tags: "{{ item.tags | default(omit) }}"
     zone: "{{ item.zone | default(molecule_yml.driver.region + '-b') }}"
     project: "{{ gcp_project_id }}"
     scopes: "{{ molecule_yml.driver.scopes | default(['https://www.googleapis.com/auth/compute'], True) }}"

src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml

@@ -13,6 +13,7 @@
         subnetwork:
           selfLink: "{{ gcp_snet }}"
         access_configs: "{{ [{'name': 'instance_ip', 'type': 'ONE_TO_ONE_NAT'}] if molecule_yml.driver.external_access else [] }}"
+    tags: "{{ item.tags | default(omit) }}"
     zone: "{{ item.zone | default(molecule_yml.driver.region + '-b') }}"
     project: "{{ gcp_project_id }}"
     scopes: "{{ molecule_yml.driver.scopes | default(['https://www.googleapis.com/auth/compute'], True) }}"

test/vagrant-plugin/scenarios/molecule/box_url/molecule.yml

@@ -8,8 +8,8 @@ driver:
 platforms:
   - name: instance
     box: centos/stream9
-    box_url: "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-20230704.1.x86_64.vagrant-libvirt.box"
-    box_download_checksum: "8a9fe7e8083421047e5404131daa007b4c1bcc466f3d9b29d0e7c7e432891a0e"
+    box_url: "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-20240930.0.x86_64.vagrant-libvirt.box"
+    box_download_checksum: "0dd55e0d6d1686181e3ad2636f942d5295be4c3d01e0e1c824fc02ec58728375"
     box_download_checksum_type: "sha256"
 provisioner:
   name: ansible