From f5d34df2d877764404e4430c3ab82fd10231ad0c Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 1 Oct 2024 12:57:09 +0200 Subject: [PATCH] testnode: move removing openmpi-common to apt_systems.yml Otherwise, because it's placed in ubuntu.yml, it resets packages_to_remove list defined in apt_systems.yml to just openmpi-common and commit 701d3594d220 ("testnode: remove tgt") doesn't take effect. While at it, fix a typo in the comment -- it's mpich. Signed-off-by: Ilya Dryomov --- roles/testnode/vars/apt_systems.yml | 2 ++ roles/testnode/vars/ubuntu.yml | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/testnode/vars/apt_systems.yml b/roles/testnode/vars/apt_systems.yml index 20bc4bef..bdcda516 100644 --- a/roles/testnode/vars/apt_systems.yml +++ b/roles/testnode/vars/apt_systems.yml @@ -6,6 +6,8 @@ nfs_service: nfs-kernel-server packages_to_remove: # multipath interferes with krbd tests - multipath-tools + # openmpi-common conflicts with mpich stuff + - openmpi-common # tgt interferes with ceph-iscsi tests - tgt diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml index 9c6c83b9..36ee10aa 100644 --- a/roles/testnode/vars/ubuntu.yml +++ b/roles/testnode/vars/ubuntu.yml @@ -92,7 +92,3 @@ non_aarch64_packages_to_upgrade: no_recommended_packages: - collectl - -packages_to_remove: - # openmpi-common conflicts with mpitch stuff - - openmpi-common -- 2.47.3