diff --git a/irods_consortium_continuous_integration_build_hook.py b/irods_consortium_continuous_integration_build_hook.py index cdc978beb..d2107f774 100644 --- a/irods_consortium_continuous_integration_build_hook.py +++ b/irods_consortium_continuous_integration_build_hook.py @@ -24,11 +24,10 @@ def install_building_dependencies(externals_directory): 'irods-externals-cmake3.21.4-0', 'irods-externals-cppzmq4.8.1-1', 'irods-externals-fmt8.1.1-0', - 'irods-externals-jansson2.7-0', 'irods-externals-json3.10.4-0', 'irods-externals-libarchive3.5.2-0', 'irods-externals-nanodbc2.13.0-1', - 'irods-externals-qpid-proton0.36.0-0', + 'irods-externals-qpid-proton0.36.0-1', 'irods-externals-spdlog1.9.2-1', 'irods-externals-zeromq4-14.1.8-0' ] @@ -50,14 +49,16 @@ def install_os_specific_dependencies_apt(): irods_python_ci_utilities.install_os_packages(['libcurl4-gnutls-dev', 'make', 'libssl-dev', 'gcc']) def install_os_specific_dependencies_yum(): - irods_python_ci_utilities.install_os_packages(['curl-devel', 'openssl-devel']) + irods_python_ci_utilities.install_os_packages(['make', 'curl-devel', 'openssl-devel']) def install_os_specific_dependencies(): dispatch_map = { - 'Ubuntu': install_os_specific_dependencies_apt, - 'Centos': install_os_specific_dependencies_yum, + 'Almalinux': install_os_specific_dependencies_yum, 'Centos linux': install_os_specific_dependencies_yum, + 'Centos': install_os_specific_dependencies_yum, + 'Debian gnu_linux': install_os_specific_dependencies_apt, 'Opensuse ': install_os_specific_dependencies_yum, + 'Ubuntu': install_os_specific_dependencies_apt } try: return dispatch_map[irods_python_ci_utilities.get_distribution()]() diff --git a/irods_consortium_continuous_integration_test_hook.py b/irods_consortium_continuous_integration_test_hook.py index 53339ac60..56be0c411 100644 --- a/irods_consortium_continuous_integration_test_hook.py +++ b/irods_consortium_continuous_integration_test_hook.py @@ -23,10 +23,12 @@ def get_build_prerequisites_zypper(): def get_test_packages(): dispatch_map = { - 'Ubuntu': get_build_prerequisites_apt, - 'Centos': get_build_prerequisites_yum, + 'Almalinux': get_build_prerequisites_yum, 'Centos linux': get_build_prerequisites_yum, + 'Centos': get_build_prerequisites_yum, + 'Debian gnu_linux': get_build_prerequisites_apt, 'Opensuse': get_build_prerequisites_zypper, + 'Ubuntu': get_build_prerequisites_apt } try: return dispatch_map[irods_python_ci_utilities.get_distribution()]() @@ -46,7 +48,7 @@ def install_apache_activemq(message_broker): def install_rabbitmq(message_broker): - if irods_python_ci_utilities.get_distribution() == 'Ubuntu': + if irods_python_ci_utilities.get_distribution() in ['Ubuntu', 'Debian']: irods_python_ci_utilities.subprocess_get_output('curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.deb.sh | sudo bash', shell=True) irods_python_ci_utilities.subprocess_get_output(['wget', '-q', 'https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb']) irods_python_ci_utilities.subprocess_get_output(['sudo', 'dpkg', '-i', 'erlang-solutions_1.0_all.deb']) @@ -57,7 +59,7 @@ def install_rabbitmq(message_broker): irods_python_ci_utilities.subprocess_get_output(['sudo', 'apt-get', 'install', 'esl-erlang=1:19.3.6', '-y']) irods_python_ci_utilities.subprocess_get_output(['sudo', 'apt-get', 'install', 'rabbitmq-server', '-y']) - if irods_python_ci_utilities.get_distribution() == 'Centos' or irods_python_ci_utilities.get_distribution() == 'Centos linux': + if irods_python_ci_utilities.get_distribution() in ['Centos', 'Centos linux', 'Almalinux']: irods_python_ci_utilities.subprocess_get_output(['sudo', 'rpm', '--rebuilddb']) irods_python_ci_utilities.subprocess_get_output('curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | sudo bash', shell=True) irods_python_ci_utilities.subprocess_get_output('curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | sudo bash', shell=True)