patch: Misc improvs (#3)

* Rollback version * Use parameterized tests * Modify internal var of dcgm_exporter to make it work with version_bumper * Remove unnecessary preflight tasks * Add pre-commit config --------- Signed-off-by: Mahendra Paipuri <[email protected]>
mahendrapaipuri · Feb 26, 2024 · 2c9b71e · 2c9b71e
1 parent 6cb28c1
commit 2c9b71e
Show file tree

Hide file tree

Showing 21 changed files with 299 additions and 350 deletions.
diff --git a/.config/molecule/config-podman.yml b/.config/molecule/config-podman.yml
@@ -73,6 +73,9 @@ platforms:
     command: /lib/systemd/systemd
 verifier:
   name: testinfra
+  directory: ${MOLECULE_SCENARIO_DIRECTORY}/tests
+  options:
+    rootdir: "${MOLECULE_SCENARIO_DIRECTORY}"
 provisioner:
   playbooks:
     converge: ${MOLECULE_PROJECT_DIRECTORY}/../../.config/molecule/converge.yml
diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
@@ -73,6 +73,9 @@ platforms:
     command: /lib/systemd/systemd
 verifier:
   name: testinfra
+  directory: ${MOLECULE_SCENARIO_DIRECTORY}/tests
+  options:
+    rootdir: "${MOLECULE_SCENARIO_DIRECTORY}"
 provisioner:
   playbooks:
     converge: ${MOLECULE_PROJECT_DIRECTORY}/../../.config/molecule/converge.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+---
+repos:
+  - repo: https://github.com/ansible/ansible-lint.git
+    rev: v24.2.0
+    hooks:
+      - id: ansible-lint
+        files: \.(yaml|yml)$
+        name: Ansible Lint
+        description: Run configurations on .ansible-lint file
+        verbose: true
diff --git a/.yamllint.yml b/.yamllint.yml
@@ -20,7 +20,7 @@ rules:
   hyphens:
     level: error
   line-length:
-    max: 260
+    max: 200
   truthy:
     check-keys: false
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,9 +0,0 @@
-=====================================
-mahendrapaipuri.Ansible Release Notes
-=====================================
-
-.. contents:: Topics
-
-v0.1.0
-======
-

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -85,12 +85,3 @@ Remember: Code is generally read much more often than written.
 ### Use Markdown
 
 Wherever possible, please refrain from any other formats and stick to simple markdown.
-
-## Requirements regarding roles design 
-
-We are trying to create the best and most secure installation method for non-containerized prometheus stack components.
-To accomplish this all roles need to support:
-
-- current and at least one previous ansible version
-- systemd as the only available process manager
-- at least latest debian and CentOS distributions
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -1,4 +1,3 @@
+---
 ancestor: null
-releases:
-  0.1.0:
-    release_date: '2024-02-24'
+releases: {}
diff --git a/galaxy.yml b/galaxy.yml
@@ -7,7 +7,7 @@ namespace: mahendrapaipuri
 # The name of the collection. Has the same character restrictions as 'namespace'
 name: ansible
 # The version of the collection. Must be compatible with semantic versioning
-version: 0.1.0
+version: 0.0.0
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
 # A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)

diff --git a/roles/ceems_api_server/molecule/alternative/tests/test_alternative.py b/roles/ceems_api_server/molecule/alternative/tests/test_alternative.py
@@ -3,46 +3,44 @@
 
 import os
 import testinfra.utils.ansible_runner
+import pytest
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-def test_directories(host):
-    dirs = [
-        "/var/lib/ceems_api_server",
-        "/tmp/ceems_api_server"
-    ]
-    for dir in dirs:
-        d = host.file(dir)
-        assert d.is_directory
-        assert d.exists
-
-
-def test_files(host):
-    files = [
-        "/etc/systemd/system/ceems_api_server.service",
-        "/usr/local/bin/ceems_api_server"
-    ]
-    for file in files:
-        f = host.file(file)
-        assert f.exists
-        assert f.is_file
-
-
-def test_permissions_didnt_change(host):
-    dirs = [
-        "/etc",
-        "/root",
-        "/usr",
-        "/var"
-    ]
-    for file in dirs:
-        f = host.file(file)
-        assert f.exists
-        assert f.is_directory
-        assert f.user == "root"
-        assert f.group == "root"
+@pytest.mark.parametrize("dir", [
+    "/var/lib/ceems_api_server",
+    "/tmp/ceems_api_server"
+])
+def test_directories(host, dir):
+    d = host.file(dir)
+    assert d.is_directory
+    assert d.exists
+
+
+@pytest.mark.parametrize("file", [
+    "/etc/systemd/system/ceems_api_server.service",
+    "/usr/local/bin/ceems_api_server"
+])
+def test_files(host, file):
+    f = host.file(file)
+    assert f.exists
+    assert f.is_file
+
+
+@pytest.mark.parametrize("dir", [
+    "/etc",
+    "/root",
+    "/usr",
+    "/var"
+])
+def test_permissions_didnt_change(host, dir):
+    f = host.file(dir)
+    assert f.exists
+    assert f.is_directory
+    assert f.user == "root"
+    assert f.group == "root"
 
 
 def test_user(host):
@@ -72,10 +70,9 @@ def test_systemd_properties(host):
     assert p.get("Environment") == "foo=bar"
 
 
-def test_socket(host):
-    sockets = [
-        "tcp://127.0.0.1:8080"
-    ]
-    for socket in sockets:
-        s = host.socket(socket)
-        assert s.is_listening
+@pytest.mark.parametrize("socket", [
+    "tcp://127.0.0.1:8080"
+])
+def test_socket(host, socket):
+    s = host.socket(socket)
+    assert s.is_listening
diff --git a/roles/ceems_api_server/molecule/default/tests/test_default.py b/roles/ceems_api_server/molecule/default/tests/test_default.py
@@ -3,45 +3,43 @@
 
 import os
 import testinfra.utils.ansible_runner
+import pytest
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-def test_directories(host):
-    dirs = [
-        "/var/lib/ceems_api_server"
-    ]
-    for dir in dirs:
-        d = host.file(dir)
-        assert d.is_directory
-        assert d.exists
-
-
-def test_files(host):
-    files = [
-        "/etc/systemd/system/ceems_api_server.service",
-        "/usr/local/bin/ceems_api_server"
-    ]
-    for file in files:
-        f = host.file(file)
-        assert f.exists
-        assert f.is_file
-
-
-def test_permissions_didnt_change(host):
-    dirs = [
-        "/etc",
-        "/root",
-        "/usr",
-        "/var"
-    ]
-    for file in dirs:
-        f = host.file(file)
-        assert f.exists
-        assert f.is_directory
-        assert f.user == "root"
-        assert f.group == "root"
+@pytest.mark.parametrize("dir", [
+    "/var/lib/ceems_api_server"
+])
+def test_directories(host, dir):
+    d = host.file(dir)
+    assert d.is_directory
+    assert d.exists
+
+
+@pytest.mark.parametrize("file", [
+    "/etc/systemd/system/ceems_api_server.service",
+    "/usr/local/bin/ceems_api_server"
+])
+def test_files(host, file):
+    f = host.file(file)
+    assert f.exists
+    assert f.is_file
+
+
+@pytest.mark.parametrize("dir", [
+    "/etc",
+    "/root",
+    "/usr",
+    "/var"
+])
+def test_permissions_didnt_change(host, dir):
+    f = host.file(dir)
+    assert f.exists
+    assert f.is_directory
+    assert f.user == "root"
+    assert f.group == "root"
 
 
 def test_user(host):
@@ -70,10 +68,9 @@ def test_protecthome_property(host):
     assert p.get("ProtectHome") == "yes"
 
 
-def test_socket(host):
-    sockets = [
-        "tcp://127.0.0.1:9020"
-    ]
-    for socket in sockets:
-        s = host.socket(socket)
-        assert s.is_listening
+@pytest.mark.parametrize("socket", [
+    "tcp://127.0.0.1:9020"
+])
+def test_socket(host, socket):
+    s = host.socket(socket)
+    assert s.is_listening
diff --git a/roles/ceems_api_server/molecule/latest/tests/test_latest.py b/roles/ceems_api_server/molecule/latest/tests/test_latest.py
@@ -3,45 +3,43 @@
 
 import os
 import testinfra.utils.ansible_runner
+import pytest
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-def test_directories(host):
-    dirs = [
-        "/var/lib/ceems_api_server"
-    ]
-    for dir in dirs:
-        d = host.file(dir)
-        assert d.is_directory
-        assert d.exists
-
-
-def test_files(host):
-    files = [
-        "/etc/systemd/system/ceems_api_server.service",
-        "/usr/local/bin/ceems_api_server"
-    ]
-    for file in files:
-        f = host.file(file)
-        assert f.exists
-        assert f.is_file
-
-
-def test_permissions_didnt_change(host):
-    dirs = [
-        "/etc",
-        "/root",
-        "/usr",
-        "/var"
-    ]
-    for file in dirs:
-        f = host.file(file)
-        assert f.exists
-        assert f.is_directory
-        assert f.user == "root"
-        assert f.group == "root"
+@pytest.mark.parametrize("dir", [
+    "/var/lib/ceems_api_server"
+])
+def test_directories(host, dir):
+    d = host.file(dir)
+    assert d.is_directory
+    assert d.exists
+
+
+@pytest.mark.parametrize("file", [
+    "/etc/systemd/system/ceems_api_server.service",
+    "/usr/local/bin/ceems_api_server"
+])
+def test_files(host, file):
+    f = host.file(file)
+    assert f.exists
+    assert f.is_file
+
+
+@pytest.mark.parametrize("dir", [
+    "/etc",
+    "/root",
+    "/usr",
+    "/var"
+])
+def test_permissions_didnt_change(host, dir):
+    f = host.file(dir)
+    assert f.exists
+    assert f.is_directory
+    assert f.user == "root"
+    assert f.group == "root"
 
 
 def test_user(host):
@@ -70,10 +68,9 @@ def test_protecthome_property(host):
     assert p.get("ProtectHome") == "yes"
 
 
-def test_socket(host):
-    sockets = [
-        "tcp://127.0.0.1:9020"
-    ]
-    for socket in sockets:
-        s = host.socket(socket)
-        assert s.is_listening
+@pytest.mark.parametrize("socket", [
+    "tcp://127.0.0.1:9020"
+])
+def test_socket(host, socket):
+    s = host.socket(socket)
+    assert s.is_listening