From b1584d18ac1dfbe8557a06cb182ab46271da09db Mon Sep 17 00:00:00 2001 From: Waldemar Smirnow Date: Thu, 19 Dec 2024 12:06:48 +0100 Subject: [PATCH] Molecule tests refactory This customizations are made: - Dropped support for EL8 and EL9 due to EOL - Dropped support for Debian Bullseye due to EOL - Debian stable support added - Replaced python image with debian, due to inconsistent Python versions - Changed molecule driver to containers - works with Podman and Docker --- .dev_requirements.txt | 5 +++-- molecule/default/converge.yml | 2 +- molecule/default/molecule.yml | 30 ++++++++++++------------------ molecule/default/verify.yml | 2 +- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.dev_requirements.txt b/.dev_requirements.txt index 674b4f0..842c803 100644 --- a/.dev_requirements.txt +++ b/.dev_requirements.txt @@ -2,5 +2,6 @@ ansible ansible-lint yamllint molecule -molecule-docker -molecule-podman \ No newline at end of file +molecule-plugins +molecule-plugins[docker] +molecule-plugins[podman] \ No newline at end of file diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 31cfafc..33bf05a 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -2,7 +2,7 @@ - name: Converge hosts: all vars: - opencast_version_major: 12 + opencast_version_major: 17 opencast_repository_enabled_release: true opencast_repository_enabled_testing: true tasks: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 60e0850..cbd5f48 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,41 +1,35 @@ --- dependency: name: galaxy + enabled: false driver: - name: podman + name: containers platforms: - - name: oc_repository_centos_7 - image: docker.io/library/centos:7 - pre_build_image: true - - name: oc_repository_centos_8 - image: quay.io/centos/centos:stream8 + - name: oc_repository_centos_9 + image: quay.io/centos/centos:stream9 pre_build_image: false command: /sbin/init tmpfs: - - /run - - /tmp + "/run": "rw,noexec,nosuid,nodev" + "/tmp": "exec" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: oc_repository_centos_9 - image: quay.io/centos/centos:stream9 + - name: oc_repository_debian + image: docker.io/debian:stable pre_build_image: false command: /sbin/init tmpfs: - - /run - - /tmp + "/run": "rw,noexec,nosuid,nodev" + "/tmp": "exec" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: oc_repository_debian - image: docker.io/library/python:bullseye - pre_build_image: true - name: oc_repository_ubuntu image: docker.io/ubuntu:latest pre_build_image: false - privileged: true command: /sbin/init tmpfs: - - /run - - /tmp + "/run": "rw,noexec,nosuid,nodev" + "/tmp": "exec" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro lint: | diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 539a079..5436799 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -3,7 +3,7 @@ hosts: all gather_facts: true vars: - opencast_version_major: 12 + opencast_version_major: 17 tasks: - name: Test if opencast is available ansible.builtin.package: