Skip to content

Commit

Permalink
Change build order
Browse files Browse the repository at this point in the history
  • Loading branch information
maccelf committed Jun 18, 2024
1 parent 6f13981 commit b3ce6ee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build_node/build_node_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def __upload_artifacts(self, artifacts_dir,
return artifacts

def __request_task(self):
supported_arches = [self.__config.base_arch]
supported_arches = ['src', self.__config.base_arch]
if self.__config.base_arch == 'x86_64':
supported_arches.append('i686')
task = self.__call_master(
Expand Down
4 changes: 4 additions & 0 deletions build_node/builders/base_rpm_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ def build_packages(self, src_dir, spec_file=None):
excluded, reason = self.is_build_excluded(srpm_path)
if excluded:
raise BuildExcluded(reason)
if self.task.arch == 'src':
return
self.logger.info('starting RPM build')
self.build_binaries(srpm_path, mock_defines)
self.logger.info('RPM build completed')
Expand Down Expand Up @@ -441,6 +443,8 @@ def generate_mock_config(config, task, srpm_build=False):
**yum_config_kwargs)
mock_config_kwargs = {'use_bootstrap_container': False, 'macros': {}}
target_arch = task.arch
if target_arch == 'src':
target_arch = config.base_arch
for key, value in task.platform.data['mock'].items():
if key == 'target_arch':
target_arch = value
Expand Down
2 changes: 2 additions & 0 deletions build_node/mock/mock_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@ def get_default_legal_host_arches(target_arch):
return 'ppc64le'
elif target_arch in ('s390x', ):
return 's390x'
elif target_arch == 'src':
return 'src'
raise ValueError('there is no default_host_arches value for {0} '
'architecture'.format(target_arch))

Expand Down

0 comments on commit b3ce6ee

Please sign in to comment.