From c8851f32f3ab41525635c37db078e8ccc5249e8b Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 30 Jan 2023 16:37:17 +0100 Subject: [PATCH] Fix molecule for Leap 15.4 Fix the molecule test for Leap 15.4 --- molecule/default/Dockerfile.leap15_3 | 7 ------- molecule/default/molecule.yml | 19 +------------------ 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 molecule/default/Dockerfile.leap15_3 diff --git a/molecule/default/Dockerfile.leap15_3 b/molecule/default/Dockerfile.leap15_3 deleted file mode 100644 index f32602a..0000000 --- a/molecule/default/Dockerfile.leap15_3 +++ /dev/null @@ -1,7 +0,0 @@ -FROM registry.opensuse.org/opensuse/leap:15.3 - -# 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 - -# Start container with systemd -ENTRYPOINT ["/usr/sbin/init"] diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 7114088..a23e134 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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 @@ -28,13 +17,7 @@ provisioner: name: ansible inventory: host_vars: - leap15_3: - nodename: "jellyfish" leap15_4: nodename: "jellyfish" verifier: name: testinfra - lint: - name: flake8 -lint: | - yamllint -d "{extends: relaxed, rules: {line-length: {max: 200}}}" .