mirror of
https://github.com/ansible-collections/google.cloud.git
synced 2025-08-02 12:14:33 -07:00
Try updating gcloud molecule test docker image versions
This commit is contained in:
parent
c819fc798d
commit
d1cf030d93
3 changed files with 8 additions and 8 deletions
|
@ -46,7 +46,7 @@ RUN yum -y install python-pip
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{# Install of Python3 #}
|
{# 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 \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
apt-utils python3-setuptools python3-pip
|
apt-utils python3-setuptools python3-pip
|
||||||
|
@ -99,13 +99,13 @@ RUN locale-gen en_US.UTF-8
|
||||||
RUN mkdir -p /etc/ansible
|
RUN mkdir -p /etc/ansible
|
||||||
RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
|
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"]
|
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"]
|
VOLUME ["/sys/fs/cgroup", "/tmp", "/run"]
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if item.image in ["centos:7", "centos:8"] %}
|
{% if item.image in ["centos:7", "centos:8"] %}
|
||||||
CMD ["/usr/sbin/init"]
|
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"]
|
CMD ["/lib/systemd/systemd"]
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -9,13 +9,13 @@ lint: |
|
||||||
ansible-lint
|
ansible-lint
|
||||||
platforms:
|
platforms:
|
||||||
- name: instance
|
- name: instance
|
||||||
image: ubuntu:20.04
|
image: ubuntu:24.04
|
||||||
privileged: true
|
privileged: true
|
||||||
ansible.builtin.command: /lib/systemd/systemd
|
ansible.builtin.command: /lib/systemd/systemd
|
||||||
volumes:
|
volumes:
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
- name: instance
|
- name: instance
|
||||||
image: debian:10
|
image: debian:12
|
||||||
privileged: true
|
privileged: true
|
||||||
ansible.builtin.command: /lib/systemd/systemd
|
ansible.builtin.command: /lib/systemd/systemd
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -9,13 +9,13 @@ lint: |
|
||||||
ansible-lint
|
ansible-lint
|
||||||
platforms:
|
platforms:
|
||||||
- name: instance
|
- name: instance
|
||||||
image: ubuntu:20.04
|
image: ubuntu:24.04
|
||||||
privileged: true
|
privileged: true
|
||||||
ansible.builtin.command: /lib/systemd/systemd
|
ansible.builtin.command: /lib/systemd/systemd
|
||||||
volumes:
|
volumes:
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
- name: instance
|
- name: instance
|
||||||
image: debian:10
|
image: debian:12
|
||||||
privileged: true
|
privileged: true
|
||||||
ansible.builtin.command: /lib/systemd/systemd
|
ansible.builtin.command: /lib/systemd/systemd
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue