diff --git a/dockerfiles/debian/Dockerfile b/dockerfiles/debian/Dockerfile deleted file mode 100644 index 21013b1..0000000 --- a/dockerfiles/debian/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# Debian Bookworm с systemd -# Автор: Сергей Антропов -# Сайт: https://devops.org.ru - -FROM debian:bookworm - -# Обновляем систему -RUN apt-get update && apt-get dist-upgrade -y - -# Устанавливаем systemd и необходимые пакеты -RUN apt-get install -y \ - systemd \ - systemd-sysv \ - dbus \ - curl \ - wget \ - nano \ - python3 \ - python3-pip \ - sudo \ - && apt-get clean - -# Устанавливаем Docker вручную для Debian -# RUN apt-get update && apt-get install -y \ -# ca-certificates \ -# curl \ -# gnupg \ -# lsb-release \ -# && mkdir -p /usr/share/keyrings \ -# && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ -# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ -# && apt-get update \ -# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ -# && apt-get clean - -# Устанавливаем Docker Compose -# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \ -# && chmod +x /usr/local/bin/docker-compose - -# Настраиваем systemd -RUN systemctl set-default multi-user.target - -# Настраиваем sudoers для root и пользователей -RUN echo "root ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ - echo "ALL ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/ansible-test - -# Создаем пользователя для Ansible -RUN useradd -m -s /bin/bash ansible \ - && echo "ansible ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -# Команда по умолчанию (система запускается от root для systemd) -CMD ["/sbin/init"] diff --git a/docs/all-images-preset.md b/docs/all-images-preset.md index aecf908..fc8dbf4 100644 --- a/docs/all-images-preset.md +++ b/docs/all-images-preset.md @@ -2,18 +2,25 @@ ## Описание -Пресет `all-images` предназначен для комплексного тестирования Ansible ролей на всех доступных операционных системах проекта. Это самый полный пресет, который включает все 9 образов: +Пресет `all-images` предназначен для комплексного тестирования Ansible ролей на всех доступных операционных системах проекта. Это самый полный пресет, который включает все 16 образов: ### Включенные образы #### Debian-based системы: -- **Ubuntu** (ubuntu-test) - порт 8080 -- **Debian** (debian-test) - порт 8081 -- **Alt Linux** (alt-test) - порт 8082 -- **Astra Linux** (astra-test) - порт 8083 +- **Ubuntu 20.04** (ubuntu20-test) - порт 8080 +- **Ubuntu 22.04** (ubuntu22-test) - порт 8081 +- **Ubuntu 24.04** (ubuntu24-test) - порт 8082 +- **Debian 9** (debian9-test) - порт 8083 +- **Debian 10** (debian10-test) - порт 8084 +- **Debian 11** (debian11-test) - порт 8085 +- **Debian 12** (debian12-test) - порт 8086 +- **Alt Linux** (alt-test) - порт 8087 +- **Astra Linux** (astra-test) - порт 8088 #### RHEL-based системы: -- **CentOS** (centos-test) - порт 8084 +- **CentOS 7** (centos7-test) - порт 8090 +- **CentOS 8** (centos8-test) - порт 8091 +- **CentOS 9** (centos9-test) - порт 8092 - **RHEL** (rhel-test) - порт 8085 - **AlmaLinux** (alma-test) - порт 8086 - **Rocky Linux** (rocky-test) - порт 8087 @@ -35,20 +42,27 @@ make role test all-images make docker build ``` -2. **Достаточно ресурсов** - тест запускает 9 контейнеров одновременно, требуется: - - Минимум 8GB RAM - - Минимум 4 CPU cores +2. **Достаточно ресурсов** - тест запускает 16 контейнеров одновременно, требуется: + - Минимум 16GB RAM + - Минимум 8 CPU cores - Достаточно места на диске ### Особенности #### Порты Каждый контейнер использует уникальный порт для доступа: -- Ubuntu: `localhost:8080` -- Debian: `localhost:8081` -- Alt Linux: `localhost:8082` -- Astra Linux: `localhost:8083` -- CentOS: `localhost:8084` +- Ubuntu 20.04: `localhost:8080` +- Ubuntu 22.04: `localhost:8081` +- Ubuntu 24.04: `localhost:8082` +- Debian 9: `localhost:8083` +- Debian 10: `localhost:8084` +- Debian 11: `localhost:8085` +- Debian 12: `localhost:8086` +- Alt Linux: `localhost:8087` +- Astra Linux: `localhost:8088` +- CentOS 7: `localhost:8090` +- CentOS 8: `localhost:8091` +- CentOS 9: `localhost:8092` - RHEL: `localhost:8085` - AlmaLinux: `localhost:8086` - Rocky Linux: `localhost:8087` @@ -72,9 +86,9 @@ make role test all-images - **Очистка**: ~30 секунд ### Ресурсы -- **RAM**: 8-16GB (рекомендуется) -- **CPU**: 4-8 cores -- **Диск**: 10-20GB свободного места +- **RAM**: 16-32GB (рекомендуется) +- **CPU**: 8-16 cores +- **Диск**: 20-40GB свободного места ## Отладка diff --git a/docs/platform-support.md b/docs/platform-support.md index 2c3b339..a23c337 100644 --- a/docs/platform-support.md +++ b/docs/platform-support.md @@ -118,10 +118,10 @@ hosts: ### Универсальные хосты Следующие системы работают на всех платформах: -- Ubuntu -- Debian +- Ubuntu 20.04, 22.04, 24.04 +- Debian 9, 10, 11, 12 - Alt Linux -- CentOS +- CentOS 7, 8, 9 - RHEL - AlmaLinux - Rocky Linux diff --git a/molecule/presets/all-images.yml b/molecule/presets/all-images.yml index 9aab60a..a0c39bd 100644 --- a/molecule/presets/all-images.yml +++ b/molecule/presets/all-images.yml @@ -37,7 +37,7 @@ systemd_defaults: hosts: # Debian-based системы - name: ubuntu20-test - family: ubuntu20 + family: ubuntu2220 groups: [test, debian, ubuntu] publish: - "8080:80" @@ -46,7 +46,7 @@ hosts: TEST_FAMILY: "Debian" - name: ubuntu22-test - family: ubuntu22 + family: ubuntu2222 groups: [test, debian, ubuntu] publish: - "8081:80" @@ -55,7 +55,7 @@ hosts: TEST_FAMILY: "Debian" - name: ubuntu24-test - family: ubuntu24 + family: ubuntu2224 groups: [test, debian, ubuntu] publish: - "8082:80" @@ -64,7 +64,7 @@ hosts: TEST_FAMILY: "Debian" - name: debian9-test - family: debian9 + family: debian129 groups: [test, debian] publish: - "8083:80" @@ -73,7 +73,7 @@ hosts: TEST_FAMILY: "Debian" - name: debian10-test - family: debian10 + family: debian1210 groups: [test, debian] publish: - "8084:80" @@ -82,7 +82,7 @@ hosts: TEST_FAMILY: "Debian" - name: debian11-test - family: debian11 + family: debian1211 groups: [test, debian] publish: - "8085:80" @@ -91,7 +91,7 @@ hosts: TEST_FAMILY: "Debian" - name: debian12-test - family: debian12 + family: debian1212 groups: [test, debian] publish: - "8086:80" @@ -120,7 +120,7 @@ hosts: # RHEL-based системы - name: centos7-test - family: centos7 + family: centos97 groups: [test, rhel, centos] publish: - "8090:80" @@ -129,7 +129,7 @@ hosts: TEST_FAMILY: "RedHat" - name: centos8-test - family: centos8 + family: centos98 groups: [test, rhel, centos] publish: - "8091:80" @@ -138,7 +138,7 @@ hosts: TEST_FAMILY: "RedHat" - name: centos9-test - family: centos9 + family: centos99 groups: [test, rhel, centos] publish: - "8092:80" diff --git a/molecule/presets/default.yml b/molecule/presets/default.yml index 66bb22b..ae06c01 100644 --- a/molecule/presets/default.yml +++ b/molecule/presets/default.yml @@ -36,8 +36,8 @@ systemd_defaults: hosts: # Стандартный набор - 2 хоста для базового тестирования (стабильные ОС) - name: u1 - family: ubuntu22 + family: ubuntu2222 groups: [test, web] - name: u2 - family: debian12 + family: debian1212 groups: [test, web] \ No newline at end of file diff --git a/molecule/presets/docker-full.yml b/molecule/presets/docker-full.yml index 64d91c5..d104fc7 100644 --- a/molecule/presets/docker-full.yml +++ b/molecule/presets/docker-full.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -29,10 +36,10 @@ systemd_defaults: hosts: # Базовые хосты (стабильные ОС) - name: u1 - family: ubuntu22 + family: ubuntu2222 groups: [test, web] - name: u2 - family: debian12 + family: debian1212 groups: [test, web] # DinD узел (Docker-in-Docker) @@ -44,7 +51,7 @@ hosts: # DOoD узел (Docker-out-of-Docker) - name: dood1 type: dood - family: ubuntu22 + family: ubuntu2222 groups: [dood] publish: ["8081:8081"] env: diff --git a/molecule/presets/docker-test.yml b/molecule/presets/docker-test.yml index 755b195..2c8d0d8 100644 --- a/molecule/presets/docker-test.yml +++ b/molecule/presets/docker-test.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -29,7 +36,7 @@ systemd_defaults: hosts: # Тестовые хосты - name: test1 - family: debian12 + family: debian1212 groups: [test] - name: test2 family: rhel @@ -44,7 +51,7 @@ hosts: # DOoD узел (Docker-out-of-Docker) - name: dood1 type: dood - family: debian12 + family: debian1212 groups: [dood] publish: ["8081:8081"] env: diff --git a/molecule/presets/etcd-patroni.yml b/molecule/presets/etcd-patroni.yml index a7cb806..ed4292a 100644 --- a/molecule/presets/etcd-patroni.yml +++ b/molecule/presets/etcd-patroni.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -30,19 +37,19 @@ systemd_defaults: hosts: # ETCD кластер (5 узлов для высокой доступности) - name: etcd1 - family: debian12 + family: debian1212 groups: [etcd, cluster] - name: etcd2 family: rhel groups: [etcd, cluster] - name: etcd3 - family: debian12 + family: debian1212 groups: [etcd, cluster] - name: etcd4 family: rhel groups: [etcd, cluster] - name: etcd5 - family: debian12 + family: debian1212 groups: [etcd, cluster] # Patroni кластер (3 узла PostgreSQL) @@ -50,7 +57,7 @@ hosts: family: rhel groups: [patroni, database, cluster] - name: patroni2 - family: debian12 + family: debian1212 groups: [patroni, database, cluster] - name: patroni3 family: rhel @@ -58,7 +65,7 @@ hosts: # HAProxy для балансировки - name: haproxy - family: debian12 + family: debian1212 groups: [haproxy, loadbalancer] publish: ["5000:5000", "5001:5001"] # RW и RO порты diff --git a/molecule/presets/minimal.yml b/molecule/presets/minimal.yml index 1cc7b4e..9d9cf4c 100644 --- a/molecule/presets/minimal.yml +++ b/molecule/presets/minimal.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true diff --git a/molecule/presets/multi-os.yml b/molecule/presets/multi-os.yml index dba0687..de2f4f0 100644 --- a/molecule/presets/multi-os.yml +++ b/molecule/presets/multi-os.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -30,16 +37,16 @@ systemd_defaults: hosts: # Debian серверы - name: debian1 - family: debian12 + family: debian1212 groups: [debian, servers, web] - name: debian2 - family: debian12 + family: debian1212 groups: [debian, servers, web] - name: debian3 - family: debian12 + family: debian1212 groups: [debian, servers, app] - name: debian4 - family: debian12 + family: debian1212 groups: [debian, servers, app] # RHEL серверы @@ -58,7 +65,7 @@ hosts: # База данных на разных ОС - name: db-debian - family: debian12 + family: debian1212 groups: [database, debian, db] - name: db-rhel family: rhel @@ -66,7 +73,7 @@ hosts: # Load balancer - name: lb-mixed - family: debian12 + family: debian1212 groups: [loadbalancer, haproxy] publish: ["80:80", "443:443"] diff --git a/molecule/presets/performance.yml b/molecule/presets/performance.yml index 3c3bf4d..94e40ee 100644 --- a/molecule/presets/performance.yml +++ b/molecule/presets/performance.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -30,19 +37,19 @@ systemd_defaults: hosts: # Основные серверы (5 узлов) - name: server1 - family: debian12 + family: debian1212 groups: [servers, web, app] - name: server2 family: rhel groups: [servers, web, app] - name: server3 - family: debian12 + family: debian1212 groups: [servers, web, app] - name: server4 family: rhel groups: [servers, web, app] - name: server5 - family: debian12 + family: debian1212 groups: [servers, web, app] # База данных (3 узла) @@ -50,7 +57,7 @@ hosts: family: rhel groups: [database, db] - name: db2 - family: debian12 + family: debian1212 groups: [database, db] - name: db3 family: rhel @@ -58,13 +65,13 @@ hosts: # Кэш (3 узла Redis) - name: cache1 - family: debian12 + family: debian1212 groups: [cache, redis] - name: cache2 family: rhel groups: [cache, redis] - name: cache3 - family: debian12 + family: debian1212 groups: [cache, redis] # Load balancer diff --git a/molecule/presets/security.yml b/molecule/presets/security.yml index fb65f3b..da171f9 100644 --- a/molecule/presets/security.yml +++ b/molecule/presets/security.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -34,7 +41,7 @@ hosts: groups: [bastion, security, jump] publish: ["2222:22"] - name: bastion2 - family: debian12 + family: debian1212 groups: [bastion, security, jump] publish: ["2223:22"] @@ -43,7 +50,7 @@ hosts: family: rhel groups: [internal, servers, app] - name: internal2 - family: debian12 + family: debian1212 groups: [internal, servers, app] - name: internal3 family: rhel @@ -54,12 +61,12 @@ hosts: family: rhel groups: [database, secure, internal] - name: db-secure2 - family: debian12 + family: debian1212 groups: [database, secure, internal] # Мониторинг и логирование - name: monitor1 - family: debian12 + family: debian1212 groups: [monitoring, security, logs] - name: monitor2 family: rhel @@ -70,13 +77,13 @@ hosts: family: rhel groups: [firewall, network, security] - name: fw2 - family: debian12 + family: debian1212 groups: [firewall, network, security] # DOoD узел для тестирования Docker безопасности - name: docker-secure type: dood - family: debian12 + family: debian1212 groups: [docker, security, apps] publish: ["8080:8080"] env: diff --git a/molecule/presets/stable.yml b/molecule/presets/stable.yml index 953896b..71ecfd1 100644 --- a/molecule/presets/stable.yml +++ b/molecule/presets/stable.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -29,8 +36,8 @@ systemd_defaults: hosts: # Стабильные ОС для надежного тестирования - name: u1 - family: ubuntu22 + family: ubuntu2222 groups: [test, web] - name: u2 - family: debian12 + family: debian1212 groups: [test, web] diff --git a/molecule/presets/standart.yml b/molecule/presets/standart.yml index e83060b..56f6463 100644 --- a/molecule/presets/standart.yml +++ b/molecule/presets/standart.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -29,11 +36,11 @@ systemd_defaults: hosts: # Стандартный набор - 3 хоста - name: u1 - family: debian12 + family: debian1212 groups: [test] - name: u2 family: rhel groups: [test] - name: u3 - family: debian12 + family: debian1212 groups: [test] diff --git a/molecule/presets/test.yml b/molecule/presets/test.yml index d00f877..3135867 100644 --- a/molecule/presets/test.yml +++ b/molecule/presets/test.yml @@ -11,12 +11,19 @@ images: 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" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -29,5 +36,5 @@ systemd_defaults: hosts: # Минимальный набор - один хост - name: u1 - family: debian12 + family: debian1212 groups: [test]