Skip to content

Commit 849245f

Browse files
d-w-moorealanking
authored andcommitted
[#110] fixes to build and test plugin for iRODS coming release 4.3.0
1 parent 0b5ccfa commit 849245f

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

irods_consortium_continuous_integration_build_hook.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def install_building_dependencies(externals_directory):
1919
'irods-externals-avro1.9.0-0',
2020
'irods-externals-boost1.67.0-0',
2121
'irods-externals-catch22.3.0-0',
22-
'irods-externals-clang-runtime6.0-0',
23-
'irods-externals-clang6.0-0',
22+
'irods-externals-clang-runtime13.0.0-0',
23+
'irods-externals-clang13.0.0-0',
2424
'irods-externals-cppzmq4.2.3-0',
2525
'irods-externals-libarchive3.3.2-1',
2626
'irods-externals-zeromq4-14.1.6-0',
@@ -39,7 +39,7 @@ def install_building_dependencies(externals_directory):
3939
install_os_specific_dependencies()
4040

4141
def install_os_specific_dependencies_apt():
42-
irods_python_ci_utilities.install_os_packages(['make', 'python-dev', 'libssl-dev', 'gcc'])
42+
irods_python_ci_utilities.install_os_packages(['make', 'python3-dev', 'libssl-dev', 'gcc'])
4343

4444
def install_os_specific_dependencies_yum():
4545
irods_python_ci_utilities.install_os_packages(['python-devel', 'openssl-devel'])

irods_consortium_continuous_integration_test_hook.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ def main():
1919
built_packages_root_directory = options.built_packages_root_directory
2020
plugin_dir = irods_python_ci_utilities.append_os_specific_directory(built_packages_root_directory)
2121
irods_python_ci_utilities.install_os_packages_from_files([os.path.join(plugin_dir, entry) for entry in os.listdir(plugin_dir)])
22-
irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'python2 scripts/setup_python_rule_engine_as_only_rule_engine.py'], check_rc=True)
22+
irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'python3 scripts/setup_python_rule_engine_as_only_rule_engine.py'], check_rc=True)
2323

2424
test_output_file = 'log/test_output.log'
2525
try:
26-
irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'python2 scripts/run_tests.py --xml_output --run_python_suite > {0} 2>&1'.format(test_output_file)], check_rc=True)
26+
irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'python3 scripts/run_tests.py --xml_output --run_python_suite > {0} 2>&1'.format(test_output_file)], check_rc=True)
2727
finally:
2828
if output_root_directory:
2929
irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'chmod o+r -R {0}'.format(' '.join(['test-reports', 'log', test_output_file]))])

0 commit comments

Comments
 (0)