ci: cleanup molecule tests

molecule/zabbix_agent_tests/common/molecule.yml

@@ -11,7 +11,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - agent
       - ${MY_MOLECULE_VERSION:-v70}

molecule/zabbix_agent_tests/common/tests/common/test_agent.py

@@ -9,10 +9,8 @@
 
 
 def test_zabbixagent_running_and_enabled(host, zabbix_agent_service):
-    # Find out why this is not working for linuxmint and opensuse
-    if host.system_info.distribution not in ["linuxmint", "opensuse", "ubuntu"]:
-        assert zabbix_agent_service.is_running
-        assert zabbix_agent_service.is_enabled
+    assert zabbix_agent_service.is_running
+    assert zabbix_agent_service.is_enabled
 
 
 def test_zabbix_agent_dot_conf(zabbix_agent_conf):
@@ -32,9 +30,7 @@ def test_zabbix_include_dir(zabbix_agent_include_dir):
 
 
 def test_socket(host):
-    # Find out why this is not working for linuxmint and opensus
-    if host.system_info.distribution not in ["linuxmint", "opensuse"]:
-        assert host.socket("tcp://0.0.0.0:10050").is_listening
+    assert host.socket("tcp://0.0.0.0:10050").is_listening
 
 
 # def test_zabbix_package(host, zabbix_agent_package):

molecule/zabbix_agent_tests/molecule/agent2/tests/conftest.py

@@ -10,12 +10,7 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        passwd = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        passwd = host.file("/etc/zabbix/zabbix_agent2.conf")
-
-    return passwd
+    return host.file("/etc/zabbix/zabbix_agent2.conf")
 
 
 @pytest.fixture

molecule/zabbix_agent_tests/molecule/agent2autopsk/tests/conftest.py

@@ -10,12 +10,7 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        passwd = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        passwd = host.file("/etc/zabbix/zabbix_agent2.conf")
-
-    return passwd
+    return host.file("/etc/zabbix/zabbix_agent2.conf")
 
 
 @pytest.fixture

molecule/zabbix_agent_tests/molecule/autopsk/tests/conftest.py

@@ -10,12 +10,7 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        conf_file = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        conf_file = host.file("/etc/zabbix/zabbix_agentd.conf")
-
-    return conf_file
+    return host.file("/etc/zabbix/zabbix_agentd.conf")
 
 
 @pytest.fixture

molecule/zabbix_agent_tests/molecule/default/tests/conftest.py

@@ -10,16 +10,13 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        conf_file = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        conf_file = host.file("/etc/zabbix/zabbix_agentd.conf")
-
-    return conf_file
+    return host.file("/etc/zabbix/zabbix_agentd.conf")
 
 
 @pytest.fixture
 def zabbix_agent_service(host):
+    if host.system_info.distribution == "opensuse-leap" and host.get_variables().get("zabbix_agent2", False):
+        return host.service("zabbix-agent2")
     return host.service("zabbix-agent")
 
 

molecule/zabbix_javagateway/molecule.yml

@@ -11,7 +11,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - ${MY_MOLECULE_VERSION:-v70}
 provisioner:

molecule/zabbix_proxy/molecule.yml

@@ -10,7 +10,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
       - ${MY_MOLECULE_VERSION:-v70}

molecule/zabbix_repo/molecule.yml

@@ -10,7 +10,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - ${MY_MOLECULE_VERSION:-v70}
 

molecule/zabbix_server/molecule.yml

@@ -10,7 +10,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
       - ${MY_MOLECULE_VERSION:-v70}

molecule/zabbix_web/tests/test_default.py

@@ -13,7 +13,11 @@ def test_zabbix_package(host):
     version = ansible_data['zabbix_web_version']
     webserver = ansible_data['zabbix_web_http_server']
 
-    zabbix_web = host.package(f'zabbix-%s-conf' % webserver)
+    package_name = f'zabbix-{webserver}-conf'
+    if version == 7.0:
+        package_name = f'zabbix-{webserver}-conf-php8'
+
+    zabbix_web = host.package(package_name)
     assert str(version) in zabbix_web.version
 
 
@@ -22,7 +26,7 @@ def test_zabbix_web(host):
     ansible_variables = host.ansible.get_variables()
     zabbix_websrv = str(ansible_variables["zabbix_web_http_server"])
 
-    if host.system_info.distribution in ["debian", "ubuntu"]:
+    if host.system_info.distribution in ["debian", "ubuntu", "opensuse-leap"]:
         assert zabbix_web.user == "www-data"
         assert zabbix_web.group == "www-data"
     elif host.system_info.distribution == "centos":