Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions easybuild/tools/systemtools.py
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,7 @@ def get_system_info():
return {
'core_count': get_avail_core_count(),
'total_memory': get_total_memory(),
'cpu_arch': get_cpu_architecture(),
'cpu_arch_name': get_cpu_arch_name(),
'cpu_model': get_cpu_model(),
'cpu_speed': get_cpu_speed(),
Expand Down
9 changes: 4 additions & 5 deletions easybuild/tools/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,11 @@ def post_easyconfigs_pr_test_report(pr_nr, test_report, msg, init_session_state,
if system_info['cpu_arch_name'] != UNKNOWN:
system_info['cpu_model'] += " (%s)" % system_info['cpu_arch_name']

short_system_info = "%(hostname)s - %(os_type)s %(os_name)s %(os_version)s, %(cpu_model)s, Python %(pyver)s" % {
os_info = '%(hostname)s - %(os_type)s %(os_name)s %(os_version)s' % system_info
short_system_info = "%(os_info)s, %(cpu_arch)s, %(cpu_model)s, Python %(pyver)s" % {
'os_info': os_info,
'cpu_arch': system_info['cpu_arch'],
'cpu_model': system_info['cpu_model'],
'hostname': system_info['hostname'],
'os_name': system_info['os_name'],
'os_type': system_info['os_type'],
'os_version': system_info['os_version'],
'pyver': system_info['python_version'].split(' ')[0],
}

Expand Down