From 3b140c3bfc1b7b29adf245de70a081d304b7d879 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Tue, 10 May 2022 10:04:30 -0400 Subject: [PATCH 1/2] DAOS-10535 tests: Install daos-*-tests-openmpi explicitly. The daos-{client,server}-tests-openmpi packages will no longer be installed via daos-test requirements. Explicitly install them for CI testing. Signed-off-by: Phillip Henderson --- vars/getDAOSPackages.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/getDAOSPackages.groovy b/vars/getDAOSPackages.groovy index 981ac61cb..c8aae5a2d 100644 --- a/vars/getDAOSPackages.groovy +++ b/vars/getDAOSPackages.groovy @@ -26,7 +26,7 @@ String call(String distro, String next_version, String add_daos_pkgs) { String pkgs if (env.TEST_RPMS == 'true') { - pkgs = "daos{,-{client,tests,server,serialize}" + add_daos_pkgs + "}" + pkgs = "daos{,-{client{,-tests-openmpi},tests,server{,-tests-openmpi},serialize}" + add_daos_pkgs + "}" } else { pkgs = "daos{,-client}" } From e8fa223fde9fa2b064057bc426834cda2bbc8ed3 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 10:50:14 -0400 Subject: [PATCH 2/2] Replace installing daos-tests with daos-tests-internal for functional tests. Signed-off-by: Phillip Henderson --- vars/getDAOSPackages.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/getDAOSPackages.groovy b/vars/getDAOSPackages.groovy index c8aae5a2d..3db519b26 100644 --- a/vars/getDAOSPackages.groovy +++ b/vars/getDAOSPackages.groovy @@ -26,7 +26,7 @@ String call(String distro, String next_version, String add_daos_pkgs) { String pkgs if (env.TEST_RPMS == 'true') { - pkgs = "daos{,-{client{,-tests-openmpi},tests,server{,-tests-openmpi},serialize}" + add_daos_pkgs + "}" + pkgs = "daos{,-{client,tests-internal,server,serialize}" + add_daos_pkgs + "}" } else { pkgs = "daos{,-client}" }