Skip to content

Commit

Permalink
DAOS-623 packaging: Fix go/golang per distro name…
Browse files Browse the repository at this point in the history
In the Requires: on the client-tests

Skip-build-ubuntu20-rpm: true
Skip-unit-tests: true
Skip-func-test-leap15: false
Skip-func-test-el8: false
Skip-func-hw-test: true
Test-tag: test_dfuse_daos_build_wb
Skip-PR-comments: true

Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
  • Loading branch information
brianjmurrell committed Jul 7, 2023
1 parent 7e04780 commit 5ecacc1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ci/jira_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
# Expected components from the commit message, and directory in src/, src/client or utils/ is also
# valid. We've never checked/enforced these before so there have been a lot of values used in the
# past.
VALID_COMPONENTS = ('agent', 'build', 'ci', 'csum', 'doc', 'gha', 'il', 'md', 'mercury', 'pil4dfs',
'swim', 'test', 'tools')
VALID_COMPONENTS = ('agent', 'build', 'ci', 'csum', 'doc', 'gha', 'il', 'md', 'mercury',
'packaging', 'pil4dfs', 'swim', 'test', 'tools')

# Expected ticket prefix.
VALID_TICKET_PREFIX = ('DAOS', 'CORCI', 'SRE')
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.5.100-7) unstable; urgency=medium
[ Brian J. Murrell ]
* NOOP change to keep in parity with RPM version

-- Brian J. Murrell <brian.murrell@intel.com> Fri, 07 Jul 2023 16:05:01 -0400

daos (2.5.100-6) unstable; urgency=medium
[Michael MacDonald]
* Add golang-go as a tests dependency for dfuse/daos_build.py
Expand Down
9 changes: 6 additions & 3 deletions utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

Name: daos
Version: 2.5.100
Release: 6%{?relval}%{?dist}
Release: 7%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: BSD-2-Clause-Patent
Expand Down Expand Up @@ -216,7 +216,7 @@ Requires: git
Requires: dbench
Requires: lbzip2
Requires: attr
Requires: golang >= 1.18
Requires: go >= 1.18
%if (0%{?suse_version} >= 1315)
Requires: lua-lmod
Requires: libcapstone-devel
Expand Down Expand Up @@ -554,7 +554,10 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Thu Jun 29 2023 Michael MacDonald <mjmac.macdonald@intel.com> 2.3.105-6
* Fri Jul 07 2023 Brian J. Murrell <brian.murrell@intel.com> 2.5.100-7
- Fix golang aos-client-tests dependency to be go instead

* Thu Jun 29 2023 Michael MacDonald <mjmac.macdonald@intel.com> 2.5.100-6
- Install golang >= 1.18 as a daos-client-tests dependency

* Thu Jun 22 2023 Li Wei <wei.g.li@intel.com> 2.5.100-5
Expand Down

0 comments on commit 5ecacc1

Please sign in to comment.