Fix Leap 15.4

Fix the Leap 15.4 molecule test run

* Leave the machine-id file
* Switch to use `cgroupns: host` to make it run on GitHub again
This commit is contained in:
Felix Niederwanger 2023-01-30 11:44:41 +01:00
parent 3bb759ccbf
commit 47db538daf
Signed by: phoenix
GPG key ID: 31860289A704FB3C
2 changed files with 3 additions and 25 deletions

View file

@ -1,7 +1,7 @@
FROM registry.opensuse.org/opensuse/leap:15.4
# Install systemd and development tools, clear cache
RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/* && rm -f /etc/machine-id /var/lib/dbus/machine-id
RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/*
# Start container with systemd
ENTRYPOINT ["/usr/sbin/init"]

View file

@ -4,23 +4,12 @@ dependency:
driver:
name: docker
platforms:
- name: leap15_3
image: registry.opensuse.org/opensuse/leap:15.3
dockerfile: Dockerfile.leap15_3
command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
tmpfs:
- /run
- /tmp
- name: leap15_4
image: registry.opensuse.org/opensuse/leap:15.4
dockerfile: Dockerfile.leap15_4
command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
cgroupns: host
tmpfs:
- /run
- /tmp
@ -29,10 +18,7 @@ platforms:
dockerfile: Dockerfile.bullseye
command: ${MOLECULE_DOCKER_COMMAND:-"/sbin/init"}
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
capabilities:
- SYS_ADMIN
cgroupns: host
tmpfs:
- /run
- /tmp
@ -40,9 +26,6 @@ provisioner:
name: ansible
inventory:
host_vars:
leap15_3:
vhosts_dir: "/etc/nginx/vhosts.d"
deploy_nginx_config: true
leap15_4:
vhosts_dir: "/etc/nginx/vhosts.d"
deploy_nginx_config: true
@ -51,8 +34,3 @@ provisioner:
deploy_nginx_config: false
verifier:
name: testinfra
lint:
name: flake8
lint: |
set -e
yamllint .