From 5ecacc1c4c7608208146c36c5540c35956b5d7c9 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 6 Jul 2023 14:10:15 -0400 Subject: [PATCH] =?UTF-8?q?DAOS-623=20packaging:=20Fix=20go/golang=20per?= =?UTF-8?q?=20distro=20name=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ci/jira_query.py | 4 ++-- debian/changelog | 6 ++++++ utils/rpms/daos.spec | 9 ++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ci/jira_query.py b/ci/jira_query.py index b70c01c448a..3dcd4a3520b 100755 --- a/ci/jira_query.py +++ b/ci/jira_query.py @@ -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') diff --git a/debian/changelog b/debian/changelog index d33007a7711..52cf513ecdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 249b198799b..b5514807bc5 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -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 @@ -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 @@ -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 2.3.105-6 +* Fri Jul 07 2023 Brian J. Murrell 2.5.100-7 +- Fix golang aos-client-tests dependency to be go instead + +* Thu Jun 29 2023 Michael MacDonald 2.5.100-6 - Install golang >= 1.18 as a daos-client-tests dependency * Thu Jun 22 2023 Li Wei 2.5.100-5