From a6102deb7a91c71bf227e16e2dc43edb8a079e90 Mon Sep 17 00:00:00 2001
From: phoenix <felix.niederwanger@suse.com>
Date: Mon, 30 Jan 2023 16:38:31 +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          | 20 +-------------------
 molecule/default/tests/test_default.py |  2 +-
 3 files changed, 2 insertions(+), 27 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 d240c16..8ff2998 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,14 +17,7 @@ provisioner:
   name: ansible
   inventory:
     host_vars:
-      leap15_3:
-        influxdb: true
       leap15_4:
         influxdb: true
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-lint: |
-  set -e
-  yamllint .
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
index 74b507b..87ed21f 100755
--- a/molecule/default/tests/test_default.py
+++ b/molecule/default/tests/test_default.py
@@ -8,7 +8,7 @@ import os
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
  
 def test_grafana_http(host):
-	cmd = host.run("curl -v http://127.0.0.1:3000")
+	cmd = host.run("curl -v --fail http://127.0.0.1:3000")
 	assert cmd.succeeded
 	assert "/login" in cmd.stdout
 	assert "Found" in cmd.stdout