almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

LNX-286: Prepare pungi configuration and setup Jenkins job for AlmaLinux 8.4 beta 

- The script `gather_modules` should replace `-` by `_`
  in stream of modules as pungi does it in self

@BS-NOBUILD
@BS-TARGET-CL8

Change-Id: Iea05b70afbf80f3ccd20ad4943c9d86c7ed7aa90
This commit is contained in:
stepan_oksanichenko 2021-04-22 13:31:30 +03:00
parent 4d763514c1
commit 01bce26275
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pungi/scripts/gather_modules.py
View File

@ -55,9 +55,11 @@ def collect_modules(modules_paths: List[BinaryIO], target_dir: str):
path = os.path.join(module_defaults_path, name) path = os.path.join(module_defaults_path, name)
logging.info('Found %s module defaults', name) logging.info('Found %s module defaults', name)
else: else:
# pungi.phases.pkgset.sources.source_koji.get_koji_modules
stream = doc['data']['stream'].replace('-', '_')
name = '%s-%s-%s.%s' % ( name = '%s-%s-%s.%s' % (
doc['data']['name'], doc['data']['name'],
doc['data']['stream'], stream,
doc['data']['version'], doc['data']['version'],
doc['data']['context'] doc['data']['context']
) )

6
tests/test_gather_modules.py
View File

@ -13,7 +13,7 @@ document: modulemd
version: 2 version: 2
data: data:
name: mariadb-devel name: mariadb-devel
stream: 10.3 stream: 10.3-1
version: 8010020200108182321 version: 8010020200108182321
context: cdc1202b context: cdc1202b
arch: x86_64 arch: x86_64
@ -103,7 +103,7 @@ class TestModulesYamlParser(TestCase):
# check directory structure matches expected # check directory structure matches expected
self.assertEqual([MODULES_YAML_GZ, 'modules', 'module_defaults'], os.listdir(PATH_TO_KOJI)) self.assertEqual([MODULES_YAML_GZ, 'modules', 'module_defaults'], os.listdir(PATH_TO_KOJI))
self.assertEqual(['mariadb-devel-10.3-8010020200108182321.cdc1202b', self.assertEqual(['mariadb-devel-10.3_1-8010020200108182321.cdc1202b',
'javapackages-tools-201801-8000020190628172923.b07bea58'], 'javapackages-tools-201801-8000020190628172923.b07bea58'],
os.listdir(os.path.join(PATH_TO_KOJI, 'modules'))) os.listdir(os.path.join(PATH_TO_KOJI, 'modules')))
self.assertEqual(['ant.yaml'], self.assertEqual(['ant.yaml'],
@ -111,7 +111,7 @@ class TestModulesYamlParser(TestCase):
# check that modules were exported # check that modules were exported
self.assertEqual(MARIADB_MODULE, yaml.load( self.assertEqual(MARIADB_MODULE, yaml.load(
open(os.path.join(PATH_TO_KOJI, 'modules', 'mariadb-devel-10.3-8010020200108182321.cdc1202b')))) open(os.path.join(PATH_TO_KOJI, 'modules', 'mariadb-devel-10.3_1-8010020200108182321.cdc1202b'))))
self.assertEqual(JAVAPACKAGES_TOOLS_MODULE, yaml.load( self.assertEqual(JAVAPACKAGES_TOOLS_MODULE, yaml.load(
open(os.path.join(PATH_TO_KOJI, 'modules', 'javapackages-tools-201801-8000020190628172923.b07bea58')))) open(os.path.join(PATH_TO_KOJI, 'modules', 'javapackages-tools-201801-8000020190628172923.b07bea58'))))