Skip to content

DAOS-10535 tests: Remove daos-tests daos-*-tests-openmpi requirement #8980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jolivier23 merged 13 commits into from
May 20, 2022
Merged

DAOS-10535 tests: Remove daos-tests daos-*-tests-openmpi requirement #8980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ef646b2
DAOS-10535 tests: Remove daos-tests daos-*-tests-openmpi requirement
phender May 10, 2022
1777230
Fix typo.
phender May 10, 2022
bbcb78c
Fix other typo.
phender May 10, 2022
8f4f4f0
Adding daos-tests-internal package
phender May 12, 2022
184fe3e
Add missing edits.
phender May 12, 2022
bd78a7f
Adding pipeline-lib/pull/311
phender May 12, 2022
c50a637
Fixed debian changelog.
phender May 12, 2022
71517db
Fix daos.spec typo
phender May 12, 2022
58cc514
Adding .rpmignore changes
phender May 12, 2022
fefd73f
Add installing required packages for CI.
phender May 12, 2022
884aa5e
Fix typo.
phender May 12, 2022
d346e49
Fixing daos.spec
phender May 12, 2022
0c6ed1a
Merge branch 'master' into DAOS-10535_master
phender May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .rpmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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') {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ci/functional/required_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <phillip.henderson@intel.com> 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.
Expand Down
11 changes: 10 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/control/lib/control/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// (C) Copyright 2020-2021 Intel Corporation.
// (C) Copyright 2020-2022 Intel Corporation.
Copy link
Copy Markdown
Contributor

@mjmac mjmac May 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Just realized that I forgot to set up my pre-commit hook in the new clone I'm using for el8 development. Fixed.

//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down
2 changes: 1 addition & 1 deletion src/control/lib/hostlist/hostset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// (C) Copyright 2019-2021 Intel Corporation.
// (C) Copyright 2019-2022 Intel Corporation.
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down
2 changes: 1 addition & 1 deletion src/control/lib/hostlist/hostset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// (C) Copyright 2019-2021 Intel Corporation.
// (C) Copyright 2019-2022 Intel Corporation.
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down
2 changes: 1 addition & 1 deletion src/control/lib/hostlist/numericlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// (C) Copyright 2020-2021 Intel Corporation.
// (C) Copyright 2020-2022 Intel Corporation.
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down
2 changes: 1 addition & 1 deletion src/control/lib/hostlist/numericlist_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// (C) Copyright 2019-2021 Intel Corporation.
// (C) Copyright 2019-2022 Intel Corporation.
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down
19 changes: 17 additions & 2 deletions utils/rpms/daos.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Copy link
Copy Markdown
Contributor

@brianjmurrell brianjmurrell May 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that you can do this all in one commit. This will cause testing on this branch to break until the pipeline-lib change lands. Unless you close landing on this branch after this until the pipeline-lib update lands.

Copy link
Copy Markdown
Contributor Author

@phender phender May 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm temporarily including installing the daos-client-tests-openmpi package through the Jenkins file until packaging in all branches generates a daos-test-internal package, at which point pipeline-lib can be updated to install it instead of daos-tests.


%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}
Expand Down Expand Up @@ -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 <phillip.henderson@intel.com> 2.3.100-9
- Remove doas-client-tests-openmpi dependency from daos-tests
- Add daos-tests-internal package

* Mon May 9 2022 Ashley Pittman <ashley.m.pittman@intel.com> 2.3.100-8
- Extend dfusedaosbuild test to run in different configurations.

Expand Down