diff --git a/easybuild/tools/systemtools.py b/easybuild/tools/systemtools.py index 13e28cc6f3..730def2ce2 100644 --- a/easybuild/tools/systemtools.py +++ b/easybuild/tools/systemtools.py @@ -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(), diff --git a/easybuild/tools/testing.py b/easybuild/tools/testing.py index ec7d83ba37..7086c692fb 100644 --- a/easybuild/tools/testing.py +++ b/easybuild/tools/testing.py @@ -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], }