From b8faaafd1f4cea8e4639f9de011f724d2e225d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BF=D0=BE=D0=B2?= Date: Sat, 25 Oct 2025 15:50:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=81=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D1=8B=20?= =?UTF-8?q?=D0=B2=D0=BE=20=D0=B2=D1=81=D0=B5=20=D1=81=D1=83=D1=89=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D1=81=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Обновлены все пресеты для поддержки собственных образов AnsibleTemplate: - default.yml, docker-test.yml, etcd-patroni.yml - minimal.yml, multi-os.yml, performance.yml - security.yml, standart.yml, test.yml - Добавлены образы: - alt: inecs/ansible-lab:alt-linux-latest - astra: inecs/ansible-lab:astra-linux-latest - rhel: inecs/ansible-lab:rhel-latest - centos: inecs/ansible-lab:centos-latest - alma: inecs/ansible-lab:alma-latest - rocky: inecs/ansible-lab:rocky-latest - redos: inecs/ansible-lab:redos-latest - Теперь все пресеты поддерживают тестирование на собственных образах - Сохранена обратная совместимость с существующими образами Автор: Сергей Антропов Сайт: https://devops.org.ru --- molecule/presets/default.yml | 8 ++++++++ molecule/presets/docker-test.yml | 8 ++++++++ molecule/presets/etcd-patroni.yml | 8 ++++++++ molecule/presets/minimal.yml | 8 ++++++++ molecule/presets/multi-os.yml | 8 ++++++++ molecule/presets/performance.yml | 8 ++++++++ molecule/presets/security.yml | 8 ++++++++ molecule/presets/standart.yml | 8 ++++++++ molecule/presets/test.yml | 8 ++++++++ 9 files changed, 72 insertions(+) diff --git a/molecule/presets/default.yml b/molecule/presets/default.yml index 6f0c66b..89b4c3d 100644 --- a/molecule/presets/default.yml +++ b/molecule/presets/default.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/docker-test.yml b/molecule/presets/docker-test.yml index 75418ff..cf684e7 100644 --- a/molecule/presets/docker-test.yml +++ b/molecule/presets/docker-test.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/etcd-patroni.yml b/molecule/presets/etcd-patroni.yml index a1201b1..30cdd88 100644 --- a/molecule/presets/etcd-patroni.yml +++ b/molecule/presets/etcd-patroni.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/minimal.yml b/molecule/presets/minimal.yml index 1f46c9b..02e1e6e 100644 --- a/molecule/presets/minimal.yml +++ b/molecule/presets/minimal.yml @@ -9,6 +9,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/multi-os.yml b/molecule/presets/multi-os.yml index 25fd601..7cc3463 100644 --- a/molecule/presets/multi-os.yml +++ b/molecule/presets/multi-os.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/performance.yml b/molecule/presets/performance.yml index 6515879..487f57d 100644 --- a/molecule/presets/performance.yml +++ b/molecule/presets/performance.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/security.yml b/molecule/presets/security.yml index 15f562d..705a11e 100644 --- a/molecule/presets/security.yml +++ b/molecule/presets/security.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/standart.yml b/molecule/presets/standart.yml index f96dd4f..e11bb9e 100644 --- a/molecule/presets/standart.yml +++ b/molecule/presets/standart.yml @@ -10,6 +10,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" rhel: "quay.io/centos/centos:stream9-systemd" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/test.yml b/molecule/presets/test.yml index 1f46c9b..02e1e6e 100644 --- a/molecule/presets/test.yml +++ b/molecule/presets/test.yml @@ -9,6 +9,14 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы images: debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy" + # Собственные образы AnsibleTemplate + alt: "inecs/ansible-lab:alt-linux-latest" + astra: "inecs/ansible-lab:astra-linux-latest" + rhel: "inecs/ansible-lab:rhel-latest" + centos: "inecs/ansible-lab:centos-latest" + alma: "inecs/ansible-lab:alma-latest" + rocky: "inecs/ansible-lab:rocky-latest" + redos: "inecs/ansible-lab:redos-latest" systemd_defaults: privileged: true