From 4c0f33cc80c9a18f0279357767825ddafad607e5 Mon Sep 17 00:00:00 2001 From: Mahendra Paipuri Date: Sat, 24 Feb 2024 12:28:19 +0100 Subject: [PATCH] fix: Ansible sanity test fixes Signed-off-by: Mahendra Paipuri --- roles/ceems_api_server/molecule/alternative/prepare.yml | 2 +- roles/ceems_api_server/molecule/{ => default/files}/sacct | 0 roles/ceems_api_server/molecule/default/prepare.yml | 2 +- roles/ceems_api_server/molecule/latest/prepare.yml | 2 +- roles/ceems_exporter/molecule/latest/tests/test_latest.py | 3 ++- .../molecule/alternative/tests/test_alternative.py | 1 - 6 files changed, 5 insertions(+), 5 deletions(-) rename roles/ceems_api_server/molecule/{ => default/files}/sacct (100%) diff --git a/roles/ceems_api_server/molecule/alternative/prepare.yml b/roles/ceems_api_server/molecule/alternative/prepare.yml index b7e0829..d0854c1 100644 --- a/roles/ceems_api_server/molecule/alternative/prepare.yml +++ b/roles/ceems_api_server/molecule/alternative/prepare.yml @@ -29,7 +29,7 @@ tasks: - name: Create sacct executable file ansible.builtin.copy: - src: "../sacct" + src: "../default/files/sacct" dest: /usr/bin/sacct owner: root group: root diff --git a/roles/ceems_api_server/molecule/sacct b/roles/ceems_api_server/molecule/default/files/sacct similarity index 100% rename from roles/ceems_api_server/molecule/sacct rename to roles/ceems_api_server/molecule/default/files/sacct diff --git a/roles/ceems_api_server/molecule/default/prepare.yml b/roles/ceems_api_server/molecule/default/prepare.yml index 864c620..cd2d8a0 100644 --- a/roles/ceems_api_server/molecule/default/prepare.yml +++ b/roles/ceems_api_server/molecule/default/prepare.yml @@ -5,7 +5,7 @@ tasks: - name: Create sacct executable file ansible.builtin.copy: - src: "../sacct" + src: "files/sacct" dest: /usr/bin/sacct owner: root group: root diff --git a/roles/ceems_api_server/molecule/latest/prepare.yml b/roles/ceems_api_server/molecule/latest/prepare.yml index 864c620..4a75dff 100644 --- a/roles/ceems_api_server/molecule/latest/prepare.yml +++ b/roles/ceems_api_server/molecule/latest/prepare.yml @@ -5,7 +5,7 @@ tasks: - name: Create sacct executable file ansible.builtin.copy: - src: "../sacct" + src: "../default/files/sacct" dest: /usr/bin/sacct owner: root group: root diff --git a/roles/ceems_exporter/molecule/latest/tests/test_latest.py b/roles/ceems_exporter/molecule/latest/tests/test_latest.py index d323b00..de70b92 100644 --- a/roles/ceems_exporter/molecule/latest/tests/test_latest.py +++ b/roles/ceems_exporter/molecule/latest/tests/test_latest.py @@ -26,6 +26,7 @@ def test_directories(host): assert d.is_directory assert d.exists + def test_capabilities_property(host): s = host.service("ceems_exporter") p = s.systemd_properties @@ -54,4 +55,4 @@ def test_collectors(host): exporter_out = host.check_output('curl http://localhost:9010/metrics').strip() assert "ceems_scrape_collector_success{collector=\"ipmi_dcmi\"}" not in exporter_out assert "ceems_scrape_collector_success{collector=\"rapl\"}" not in exporter_out - assert "ceems_scrape_collector_success{collector=\"emissions\"}" in exporter_out \ No newline at end of file + assert "ceems_scrape_collector_success{collector=\"emissions\"}" in exporter_out diff --git a/roles/nvidia_dcgm_exporter/molecule/alternative/tests/test_alternative.py b/roles/nvidia_dcgm_exporter/molecule/alternative/tests/test_alternative.py index ec0e43a..d05ff71 100644 --- a/roles/nvidia_dcgm_exporter/molecule/alternative/tests/test_alternative.py +++ b/roles/nvidia_dcgm_exporter/molecule/alternative/tests/test_alternative.py @@ -3,7 +3,6 @@ import os import testinfra.utils.ansible_runner -import pytest testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')