From d1cf030d936a60473e5649d98ffadcfc7250fba3 Mon Sep 17 00:00:00 2001
From: Chris Hawk <hawk@google.com>
Date: Fri, 10 Jan 2025 15:44:30 -0800
Subject: [PATCH] Try updating gcloud molecule test docker image versions

---
 molecule/gcloud/Dockerfile.j2 | 8 ++++----
 molecule/gcloud/molecule.yml  | 4 ++--
 molecule/gcsfuse/molecule.yml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/molecule/gcloud/Dockerfile.j2 b/molecule/gcloud/Dockerfile.j2
index 5c2401c..c246fd9 100644
--- a/molecule/gcloud/Dockerfile.j2
+++ b/molecule/gcloud/Dockerfile.j2
@@ -46,7 +46,7 @@ RUN yum -y install python-pip
 {% endif %}
 
 {# Install of Python3 #}
-{% if item.image in ["ubuntu:18.04", "ubuntu:20.04", "debian:10"] %}
+{% if item.image in ["ubuntu:18.04", "ubuntu:20.04", "ubuntu:24.04", "debian:10", "debian:11", "debian:12"] %}
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
        apt-utils python3-setuptools python3-pip
@@ -99,13 +99,13 @@ RUN locale-gen en_US.UTF-8
 RUN mkdir -p /etc/ansible
 RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
 
-{% if item.image in ["centos:7", "centos:8", "debian:9", "debian:10"] %}
+{% if item.image in ["centos:7", "centos:8", "debian:9", "debian:10", "debian:11", "debian:12"] %}
 VOLUME ["/sys/fs/cgroup"]
-{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04"] %}
+{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:24.04"] %}
 VOLUME ["/sys/fs/cgroup", "/tmp", "/run"]
 {% endif %}
 {% if item.image in ["centos:7", "centos:8"] %}
 CMD ["/usr/sbin/init"]
-{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04", "debian:9", "debian:10"] %}
+{% elif item.image in ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:24.04", "debian:9", "debian:10", "debian:11", "debian:12"] %}
 CMD ["/lib/systemd/systemd"]
 {% endif %}
diff --git a/molecule/gcloud/molecule.yml b/molecule/gcloud/molecule.yml
index 707639a..1fa069d 100644
--- a/molecule/gcloud/molecule.yml
+++ b/molecule/gcloud/molecule.yml
@@ -9,13 +9,13 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: ubuntu:20.04
+    image: ubuntu:24.04
     privileged: true
     ansible.builtin.command: /lib/systemd/systemd
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: instance
-    image: debian:10
+    image: debian:12
     privileged: true
     ansible.builtin.command: /lib/systemd/systemd
     volumes:
diff --git a/molecule/gcsfuse/molecule.yml b/molecule/gcsfuse/molecule.yml
index 707639a..1fa069d 100644
--- a/molecule/gcsfuse/molecule.yml
+++ b/molecule/gcsfuse/molecule.yml
@@ -9,13 +9,13 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: ubuntu:20.04
+    image: ubuntu:24.04
     privileged: true
     ansible.builtin.command: /lib/systemd/systemd
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: instance
-    image: debian:10
+    image: debian:12
     privileged: true
     ansible.builtin.command: /lib/systemd/systemd
     volumes: