From e53da69db3a2ee0f2b1586d122d4ef4e24ac7df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 28 May 2018 13:15:24 +0200 Subject: [PATCH] osbs: Add nvr to metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All the components are there already separately, but having the full NVR should simplify searching the metadata with grep. JIRA: COMPOSE-2519 Signed-off-by: Lubomír Sedlář --- pungi/phases/osbs.py | 1 + tests/test_osbs_phase.py | 1 + 2 files changed, 2 insertions(+) diff --git a/pungi/phases/osbs.py b/pungi/phases/osbs.py index 7a6f6a18..85007e46 100644 --- a/pungi/phases/osbs.py +++ b/pungi/phases/osbs.py @@ -102,6 +102,7 @@ class OSBSThread(WorkerThread): 'name': buildinfo['name'], 'version': buildinfo['version'], 'release': buildinfo['release'], + 'nvr': '%(name)s-%(version)s-%(release)s' % buildinfo, 'creation_time': buildinfo['creation_time'], }) for archive in archives: diff --git a/tests/test_osbs_phase.py b/tests/test_osbs_phase.py index 4d16cc00..e68c2ca0 100644 --- a/tests/test_osbs_phase.py +++ b/tests/test_osbs_phase.py @@ -135,6 +135,7 @@ METADATA = { 'name': 'my-name', 'version': '1.0', 'release': '1', + 'nvr': 'my-name-1.0-1', 'creation_time': BUILD_INFO['creation_time'], 'filename': ARCHIVES[0]['filename'], 'size': ARCHIVES[0]['size'],