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/Jenkinsfile b/Jenkinsfile index 02e43531683..d6a39aa8e7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -701,7 +701,7 @@ pipeline { } steps { functionalTest inst_repos: daosRepos(), - inst_rpms: functionalPackages(1, next_version), + 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), + 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), + 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), + 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), + 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) + 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), + 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), + 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), + inst_rpms: functionalPackages(1, next_version, "client-tests-openmpi"), test_function: 'runTestFunctionalV2' } post { 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/changelog b/debian/changelog index 405e9ba6e18..4ba78b8263f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +daos (2.3.100-9) unstable; urgency=medium + [ Phillip Henderson ] + * Remove doas-client-tests-openmpi dependency from daos-tests + * Add daos-tests-internal package + + -- Phillip Henderson Tue, 17 May 2022 12:43:00 -0400 + daos (2.3.100-8) unstable; urgency=medium [ Ashley Pittman ] * Extend dfusedaosbuild test to run in different configurations. diff --git a/debian/control b/debian/control index 8c371ca7865..2387c37b290 100644 --- a/debian/control +++ b/debian/control @@ -92,11 +92,20 @@ 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 +Package: daos-tests-internal +Architecture: any +Multi-Arch: same +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 + Package: daos-client-tests Architecture: any Multi-Arch: same diff --git a/src/control/lib/control/response.go b/src/control/lib/control/response.go index 68c11e1f0bf..91033a9cc02 100644 --- a/src/control/lib/control/response.go +++ b/src/control/lib/control/response.go @@ -1,5 +1,5 @@ // -// (C) Copyright 2020-2021 Intel Corporation. +// (C) Copyright 2020-2022 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent // diff --git a/src/control/lib/hostlist/hostset.go b/src/control/lib/hostlist/hostset.go index e24e7465374..197cc8561ba 100644 --- a/src/control/lib/hostlist/hostset.go +++ b/src/control/lib/hostlist/hostset.go @@ -1,5 +1,5 @@ // -// (C) Copyright 2019-2021 Intel Corporation. +// (C) Copyright 2019-2022 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent // diff --git a/src/control/lib/hostlist/hostset_test.go b/src/control/lib/hostlist/hostset_test.go index 9b11c414e90..8b4ea6a7b2e 100644 --- a/src/control/lib/hostlist/hostset_test.go +++ b/src/control/lib/hostlist/hostset_test.go @@ -1,5 +1,5 @@ // -// (C) Copyright 2019-2021 Intel Corporation. +// (C) Copyright 2019-2022 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent // diff --git a/src/control/lib/hostlist/numericlist.go b/src/control/lib/hostlist/numericlist.go index c5ee686b2c5..879050771ca 100644 --- a/src/control/lib/hostlist/numericlist.go +++ b/src/control/lib/hostlist/numericlist.go @@ -1,5 +1,5 @@ // -// (C) Copyright 2020-2021 Intel Corporation. +// (C) Copyright 2020-2022 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent // diff --git a/src/control/lib/hostlist/numericlist_test.go b/src/control/lib/hostlist/numericlist_test.go index 0d8e8e3b4b0..15e940c45e6 100644 --- a/src/control/lib/hostlist/numericlist_test.go +++ b/src/control/lib/hostlist/numericlist_test.go @@ -1,5 +1,5 @@ // -// (C) Copyright 2019-2021 Intel Corporation. +// (C) Copyright 2019-2022 Intel Corporation. // // SPDX-License-Identifier: BSD-2-Clause-Patent // diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 5d35fca253f..7143f5034f4 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -27,7 +27,7 @@ Name: daos Version: 2.3.100 -Release: 8%{?relval}%{?dist} +Release: 9%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -226,11 +226,19 @@ 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 +%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-internal +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} @@ -550,10 +558,17 @@ 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 %changelog +* Tue May 17 2022 Phillip Henderson 2.3.100-9 +- Remove doas-client-tests-openmpi dependency from daos-tests +- Add daos-tests-internal package + * Mon May 9 2022 Ashley Pittman 2.3.100-8 - Extend dfusedaosbuild test to run in different configurations.