From 5ed297402014bd1d199694d5d334d1c91d6889b0 Mon Sep 17 00:00:00 2001 From: Michal Skrivanek Date: Tue, 4 Oct 2022 16:21:08 +0200 Subject: [PATCH] Enable sysstat on el9stream appliance With el9-based engine we no longer need the workaround. Needs [1] to work. [1] https://github.com/oVirt/ost-images/pull/86 --- common/deploy-scripts/setup_first_he_host.sh | 12 ++++++++++++ .../test-scenarios/test_001_he_deploy.py | 6 ++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/common/deploy-scripts/setup_first_he_host.sh b/common/deploy-scripts/setup_first_he_host.sh index 5072d050..7f168e8b 100755 --- a/common/deploy-scripts/setup_first_he_host.sh +++ b/common/deploy-scripts/setup_first_he_host.sh @@ -89,6 +89,18 @@ copy_dependencies() { dest: /var/tmp/lm_sensors.rpm with_fileglob: - "/var/tmp/lm_sensors-*" +- name: Copy sysstat dependencies to HE VM + copy: + src: "{{ item }}" + dest: /var/tmp/pcp_conf.rpm + with_fileglob: + - "/var/tmp/pcp-conf-*" +- name: Copy sysstat dependencies to HE VM + copy: + src: "{{ item }}" + dest: /var/tmp/pcp_libs.rpm + with_fileglob: + - "/var/tmp/pcp-libs-*" - name: Copy OpenSCAP profile name copy: src: /root/ost_images_openscap_profile diff --git a/he-basic-suite-master/test-scenarios/test_001_he_deploy.py b/he-basic-suite-master/test-scenarios/test_001_he_deploy.py index f40f6a36..3497d4d7 100644 --- a/he-basic-suite-master/test-scenarios/test_001_he_deploy.py +++ b/he-basic-suite-master/test-scenarios/test_001_he_deploy.py @@ -94,11 +94,9 @@ def test_set_global_maintenance(ansible_host0): def test_install_sar_collection(root_dir, ansible_engine, ost_images_distro): - # TODO: Remove when we have an el9stream-based HE available - if ost_images_distro == "el9stream": - pytest.skip("el9stream packages are not installable on el8stream HE") - ansible_engine.dnf(name='/var/tmp/lm_sensors.rpm', disable_gpg_check='yes') + ansible_engine.dnf(name='/var/tmp/pcp_conf.rpm', disable_gpg_check='yes') + ansible_engine.dnf(name='/var/tmp/pcp_libs.rpm', disable_gpg_check='yes') ansible_engine.dnf(name='/var/tmp/sysstat.rpm', disable_gpg_check='yes') ansible_engine.file( path='/etc/systemd/system/sysstat-collect.timer.d',