From ef646b29434d9ae55d40ea2f573d05219cdd447a Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Tue, 10 May 2022 10:55:04 -0400 Subject: [PATCH 01/12] DAOS-10535 tests: Remove daos-tests daos-*-tests-openmpi requirement Limit daos_tests requiement to the non-openmpi daos-*-tests packages. Signed-off-by: Phillip Henderson --- Jenkinsfile | 29 ++++++++++++++++------------- debian/changelog | 6 ++++++ debian/control | 2 +- utils/rpms/daos.spec | 7 +++++-- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c3b2219ced1..7c8817c1cae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,9 @@ // For master, this is just some wildly high number next_version = "1000" +// Additional daos RPM packages required for functional tests +add_daos_pkgs = ",-client-tests-openmpi" + // Don't define this as a type or it loses it's global scope target_branch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME def sanitized_JOB_NAME = JOB_NAME.toLowerCase().replaceAll('/', '-').replaceAll('%2f', '-') @@ -701,7 +704,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -720,7 +723,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -739,7 +742,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -758,7 +761,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -777,7 +780,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -796,7 +799,7 @@ pipeline { } steps { testRpm inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version) + daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) } } // stage('Test CentOS 7 RPMs') stage('Scan CentOS 7 RPMs') { @@ -809,7 +812,7 @@ pipeline { } steps { scanRpms inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version) + daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) } post { always { @@ -827,7 +830,7 @@ pipeline { } steps { scanRpms inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version) + daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) } post { always { @@ -845,7 +848,7 @@ pipeline { } steps { scanRpms inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version) + daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) } post { always { @@ -911,7 +914,7 @@ pipeline { } steps { storagePrepTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version) + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs) } } // stage('Test Storage Prep') stage('Test Hardware') { @@ -931,7 +934,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -951,7 +954,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { @@ -971,7 +974,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), test_function: 'runTestFunctionalV2' } post { diff --git a/debian/changelog b/debian/changelog index 3188affecf5..7ce3c85ccb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +daos (2.1.100-8) unstable; urgency=medium + [ Phillip Henderson ] + * Remove doas-client-tests-openmpi dependency from daos-tests + + -- Phillip Henderson Mon, 10 May 2022 10:53:00 -0400 + daos (2.3.100-7) unstable; urgency=medium [ Ashley Pittman ] * Add dfuse unit-test binary to call from ftest. diff --git a/debian/control b/debian/control index 8c371ca7865..6cbae9d51c4 100644 --- a/debian/control +++ b/debian/control @@ -92,7 +92,7 @@ Description: The Distributed Asynchronous Object Storage (DAOS) is an open-sourc Package: daos-tests Architecture: any Multi-Arch: same -Depends: daos-client-tests-openmpi (= ${binary:Version}) +Depends: daos-client-tests (= ${binary:Version}) Description: This is the package is a metapackage to install all of the test packages . This package contains tests diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index bda40f53cdf..de91cfbb984 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -27,7 +27,7 @@ Name: daos Version: 2.3.100 -Release: 7%{?relval}%{?dist} +Release: 8%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -226,7 +226,7 @@ This is the package needed to run a DAOS client %package tests Summary: The entire DAOS test suite -Requires: %{name}-client-tests-openmpi%{?_isa} = %{version}-%{release} +Requires: %{name}-client-tests%{?_isa} = %{version}-%{release} %description tests This is the package is a metapackage to install all of the test packages @@ -555,6 +555,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog +* Tue May 10 2022 Phillip Henderson 2.1.102-8 +- Remove doas-client-tests-openmpi dependency from daos-tests + * Fri May 6 2022 Ashley Pittman 2.3.100-7 - Add dfuse unit-test binary to call from ftest. From 17772305c946d587682afe776259e88987812d90 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Tue, 10 May 2022 13:10:37 -0400 Subject: [PATCH 02/12] Fix typo. Signed-off-by: Phillip Henderson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7ce3c85ccb3..7f50f33f3ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -daos (2.1.100-8) unstable; urgency=medium +daos (2.3.100-8) unstable; urgency=medium [ Phillip Henderson ] * Remove doas-client-tests-openmpi dependency from daos-tests From bbcb78c06783235199a5608b5d35ab0d3cc9ca40 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Tue, 10 May 2022 13:12:41 -0400 Subject: [PATCH 03/12] Fix other typo. Signed-off-by: Phillip Henderson --- utils/rpms/daos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index de91cfbb984..a6591061302 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -555,7 +555,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog -* Tue May 10 2022 Phillip Henderson 2.1.102-8 +* Tue May 10 2022 Phillip Henderson 2.3.100-8 - Remove doas-client-tests-openmpi dependency from daos-tests * Fri May 6 2022 Ashley Pittman 2.3.100-7 From 8f4f4f0408cbceea34c7c8459c5564a17a30f960 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 10:28:29 -0400 Subject: [PATCH 04/12] Adding daos-tests-internal package Signed-off-by: Phillip Henderson --- Jenkinsfile | 21 +++++++++------------ debian/control | 9 +++++++++ utils/rpms/daos.spec | 9 +++++++++ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7c8817c1cae..bc8b4c42211 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,9 +17,6 @@ // For master, this is just some wildly high number next_version = "1000" -// Additional daos RPM packages required for functional tests -add_daos_pkgs = ",-client-tests-openmpi" - // Don't define this as a type or it loses it's global scope target_branch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME def sanitized_JOB_NAME = JOB_NAME.toLowerCase().replaceAll('/', '-').replaceAll('%2f', '-') @@ -704,7 +701,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -723,7 +720,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -742,7 +739,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -761,7 +758,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -780,7 +777,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -914,7 +911,7 @@ pipeline { } steps { storagePrepTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs) + inst_rpms: functionalPackages(1, next_version) } } // stage('Test Storage Prep') stage('Test Hardware') { @@ -934,7 +931,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -954,7 +951,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { @@ -974,7 +971,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, add_daos_pkgs), + inst_rpms: functionalPackages(1, next_version), test_function: 'runTestFunctionalV2' } post { diff --git a/debian/control b/debian/control index 6cbae9d51c4..67f8b262ac3 100644 --- a/debian/control +++ b/debian/control @@ -97,6 +97,15 @@ Description: This is the package is a metapackage to install all of the test pac . This package contains tests +Package: daos-tests-internal +Architecture: any +Multi-Arch: same +Depends: daos-tests (= ${binary:Version}) +Depends: daos-client-tests-openmpi (= ${binary:Version}) +Description: This is the package is a metapackage to install all of the internal test packages + . + This package contains tests + Package: daos-client-tests Architecture: any Multi-Arch: same diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index a6591061302..54fb01fecb5 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -231,6 +231,14 @@ Requires: %{name}-client-tests%{?_isa} = %{version}-%{release} %description tests This is the package is a metapackage to install all of the test packages +%package tests-internal +Summary: The entire internal DAOS test suite +Requires: %{name}-tests%{?_isa} = %{version}-%{release} +Requires: %{name}-client-tests-openmpi%{?_isa} = %{version}-%{release} + +%description tests +This is the package is a metapackage to install all of the internal test packages + %package client-tests Summary: The DAOS test suite Requires: %{name}-client%{?_isa} = %{version}-%{release} @@ -557,6 +565,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent %changelog * Tue May 10 2022 Phillip Henderson 2.3.100-8 - Remove doas-client-tests-openmpi dependency from daos-tests +- Add daos-tests-internal package * Fri May 6 2022 Ashley Pittman 2.3.100-7 - Add dfuse unit-test binary to call from ftest. From 184fe3ef9f693a16eb8c8549bc78c3f4dae22672 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 10:42:43 -0400 Subject: [PATCH 05/12] Add missing edits. Signed-off-by: Phillip Henderson --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc8b4c42211..c3b2219ced1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -796,7 +796,7 @@ pipeline { } steps { testRpm inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) + daos_pkg_version: daosPackagesVersion(next_version) } } // stage('Test CentOS 7 RPMs') stage('Scan CentOS 7 RPMs') { @@ -809,7 +809,7 @@ pipeline { } steps { scanRpms inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) + daos_pkg_version: daosPackagesVersion(next_version) } post { always { @@ -827,7 +827,7 @@ pipeline { } steps { scanRpms inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) + daos_pkg_version: daosPackagesVersion(next_version) } post { always { @@ -845,7 +845,7 @@ pipeline { } steps { scanRpms inst_repos: daosRepos(), - daos_pkg_version: daosPackagesVersion(next_version, add_daos_pkgs) + daos_pkg_version: daosPackagesVersion(next_version) } post { always { From bd78a7f356f708a0c69cb191655191e5059e0dc5 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 10:54:52 -0400 Subject: [PATCH 06/12] Adding pipeline-lib/pull/311 Signed-off-by: Phillip Henderson --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index c3b2219ced1..48695bb9a37 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,7 @@ // To use a test branch (i.e. PR) until it lands to master // I.e. for testing library changes //@Library(value="pipeline-lib@your_branch") _ +@Library(value="pipeline-lib@DAOS-10535") _ // For master, this is just some wildly high number next_version = "1000" From c50a637979dae45250aa5f25732ed3865cd2ead2 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 11:01:53 -0400 Subject: [PATCH 07/12] Fixed debian changelog. Signed-off-by: Phillip Henderson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 7f50f33f3ad..24766b4ff8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ daos (2.3.100-8) unstable; urgency=medium [ Phillip Henderson ] * Remove doas-client-tests-openmpi dependency from daos-tests + * Add daos-tests-internal package -- Phillip Henderson Mon, 10 May 2022 10:53:00 -0400 From 71517db653e17de7a643a1150a5b216db9a0e173 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 11:18:26 -0400 Subject: [PATCH 08/12] Fix daos.spec typo Signed-off-by: Phillip Henderson --- utils/rpms/daos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 54fb01fecb5..a0ad44c18a0 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -236,7 +236,7 @@ Summary: The entire internal DAOS test suite Requires: %{name}-tests%{?_isa} = %{version}-%{release} Requires: %{name}-client-tests-openmpi%{?_isa} = %{version}-%{release} -%description tests +%description tests-internal This is the package is a metapackage to install all of the internal test packages %package client-tests From 58cc514353b404994fc89dbd6ecbad9027221a5a Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 11:59:24 -0400 Subject: [PATCH 09/12] Adding .rpmignore changes Signed-off-by: Phillip Henderson --- .rpmignore | 3 +++ ci/functional/required_packages.sh | 2 +- debian/control | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.rpmignore b/.rpmignore index b3e290ef480..88fcf08ff1e 100644 --- a/.rpmignore +++ b/.rpmignore @@ -7,16 +7,19 @@ centos7/daos-client-tests-openmpi*.rpm centos7/daos-firmware*.rpm centos7/daos-serialize*.rpm centos7/daos-server-tests-openmpi*.rpm +centos7/daos-tests-internal*.rpm el8/daos-client-tests-openmpi*.rpm el8/daos-firmware*.rpm el8/daos-serialize*.rpm el8/daos-server-tests-openmpi*.rpm +el8/daos-tests-internal*.rpm leap15/daos-client-tests-openmpi*.rpm leap15/daos-firmware*.rpm leap15/daos-serialize*.rpm leap15/daos-server-tests-openmpi*.rpm +leap15/daos-tests-internal*.rpm ubuntu20.04/daos-*.deb ubuntu20.04/libdaos*.deb diff --git a/ci/functional/required_packages.sh b/ci/functional/required_packages.sh index d724db79a2b..c83e42aaa10 100755 --- a/ci/functional/required_packages.sh +++ b/ci/functional/required_packages.sh @@ -32,7 +32,7 @@ elif [[ $distro = el* ]] || [[ $distro = centos* ]] || hdf5-vol-daos-mpich-tests \ simul-mpich \ simul-$openmpi \ - MACSio-mpich \ + MACSio-mpich \ MACSio-$openmpi \ mpifileutils-mpich" else diff --git a/debian/control b/debian/control index 67f8b262ac3..2387c37b290 100644 --- a/debian/control +++ b/debian/control @@ -100,8 +100,8 @@ Description: This is the package is a metapackage to install all of the test pac Package: daos-tests-internal Architecture: any Multi-Arch: same -Depends: daos-tests (= ${binary:Version}) -Depends: daos-client-tests-openmpi (= ${binary:Version}) +Depends: daos-tests (= ${binary:Version}), + daos-client-tests-openmpi (= ${binary:Version}) Description: This is the package is a metapackage to install all of the internal test packages . This package contains tests From fefd73f5b3096d07b71467ff1d14d032d8d787c9 Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 18:36:07 -0400 Subject: [PATCH 10/12] Add installing required packages for CI. Signed-off-by: Phillip Henderson --- Jenkinsfile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 48695bb9a37..0fa18fbf351 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,6 @@ // To use a test branch (i.e. PR) until it lands to master // I.e. for testing library changes //@Library(value="pipeline-lib@your_branch") _ -@Library(value="pipeline-lib@DAOS-10535") _ // For master, this is just some wildly high number next_version = "1000" @@ -702,7 +701,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -721,7 +720,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -740,7 +739,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -759,7 +758,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -778,7 +777,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -912,7 +911,7 @@ pipeline { } steps { storagePrepTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version) + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi") } } // stage('Test Storage Prep') stage('Test Hardware') { @@ -932,7 +931,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -952,7 +951,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -972,7 +971,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { From 884aa5eb6c64fc4dc7b5ab1b47be971159500a2e Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 18:39:33 -0400 Subject: [PATCH 11/12] Fix typo. Signed-off-by: Phillip Henderson --- Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0fa18fbf351..559f74db751 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -701,7 +701,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -720,7 +720,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -739,7 +739,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -758,7 +758,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -777,7 +777,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -911,7 +911,7 @@ pipeline { } steps { storagePrepTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi") + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi") } } // stage('Test Storage Prep') stage('Test Hardware') { @@ -931,7 +931,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -951,7 +951,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { @@ -971,7 +971,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version, "{client,server}-tests-openmpi"), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { From d346e49d9f25480eb3075c7b5a1c01d1fc1ed9aa Mon Sep 17 00:00:00 2001 From: Phillip Henderson Date: Thu, 12 May 2022 18:55:19 -0400 Subject: [PATCH 12/12] Fixing daos.spec Signed-off-by: Phillip Henderson --- utils/rpms/daos.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index a0ad44c18a0..b6fe4dad72a 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -559,6 +559,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent %files tests # No files in a meta-package +%files tests-internal +# No files in a meta-package + %files mofed-shim # No files in a shim package