Compare commits

...

4 Commits

3 changed files with 12 additions and 6 deletions

View File

@ -568,7 +568,7 @@ class RepoSync:
#print(entry_name_list) #print(entry_name_list)
for pod in entry_name_list: for pod in entry_name_list:
podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format( podman_cmd_entry = '{} run -d -it -v "{}:{}:z" -v "{}:{}:z" -v "{}:{}:z" --name {} --entrypoint {}/{} {}'.format(
cmd, cmd,
self.compose_root, self.compose_root,
self.compose_root, self.compose_root,
@ -669,7 +669,10 @@ class RepoSync:
repoclosure_entry_name_list = [] repoclosure_entry_name_list = []
self.log.info('Setting up repoclosure for {}'.format(repo)) self.log.info('Setting up repoclosure for {}'.format(repo))
for arch in self.repoclosure_map['arches']: arches_for_repoclosure = self.arches
if self.arch:
arches_for_repoclosure = self.arch.split(',')
for arch in arches_for_repoclosure:
repo_combination = [] repo_combination = []
repoclosure_entry_name = f'repoclosure-{repo}-{arch}' repoclosure_entry_name = f'repoclosure-{repo}-{arch}'
repoclosure_entry_name_list.append(repoclosure_entry_name) repoclosure_entry_name_list.append(repoclosure_entry_name)
@ -722,7 +725,7 @@ class RepoSync:
self.log.info('Spawning pods for %s' % repo) self.log.info('Spawning pods for %s' % repo)
for pod in repoclosure_entry_name_list: for pod in repoclosure_entry_name_list:
podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format( podman_cmd_entry = '{} run -d -it -v "{}:{}:z" -v "{}:{}:z" -v "{}:{}:z" --name {} --entrypoint {}/{} {}'.format(
cmd, cmd,
self.compose_root, self.compose_root,
self.compose_root, self.compose_root,
@ -1518,7 +1521,7 @@ class RepoSync:
self.log.info('Spawning pods for %s' % repo) self.log.info('Spawning pods for %s' % repo)
for pod in repoclosure_entry_name_list: for pod in repoclosure_entry_name_list:
podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format( podman_cmd_entry = '{} run -d -it -v "{}:{}:z" -v "{}:{}:z" -v "{}:{}:z" --name {} --entrypoint {}/{} {}'.format(
cmd, cmd,
self.compose_root, self.compose_root,
self.compose_root, self.compose_root,
@ -2054,7 +2057,7 @@ class SigRepoSync:
#print(entry_name_list) #print(entry_name_list)
for pod in entry_name_list: for pod in entry_name_list:
podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format( podman_cmd_entry = '{} run -d -it -v "{}:{}:z" -v "{}:{}:z" -v "{}:{}:z" --name {} --entrypoint {}/{} {}'.format(
cmd, cmd,
self.compose_root, self.compose_root,
self.compose_root, self.compose_root,

View File

@ -858,6 +858,7 @@ class IsoBuild:
mock_iso_template_output = mock_iso_template.render( mock_iso_template_output = mock_iso_template.render(
arch=self.current_arch, arch=self.current_arch,
major=self.major_version, major=self.major_version,
releasever=self.release,
fullname=self.fullname, fullname=self.fullname,
shortname=self.shortname, shortname=self.shortname,
required_pkgs=required_pkgs, required_pkgs=required_pkgs,
@ -871,6 +872,7 @@ class IsoBuild:
mock_sh_template_output = mock_sh_template.render( mock_sh_template_output = mock_sh_template.render(
arch=self.current_arch, arch=self.current_arch,
major=self.major_version, major=self.major_version,
releasever=self.release,
isolation=self.mock_isolation, isolation=self.mock_isolation,
builddir=self.mock_work_root, builddir=self.mock_work_root,
shortname=self.shortname, shortname=self.shortname,

View File

@ -969,6 +969,7 @@ class Shared:
for idx, candidate in enumerate(extra_repos): for idx, candidate in enumerate(extra_repos):
if isinstance(candidate, dict): if isinstance(candidate, dict):
url, priority = candidate['url'], candidate.get('priority', None) url, priority = candidate['url'], candidate.get('priority', None)
else:
url, priority = candidate.split(',') url, priority = candidate.split(',')
if not priority: if not priority:
priority = 100 priority = 100