From 70d567fc8021074937ecfc302aa0f815bcf999ca Mon Sep 17 00:00:00 2001 From: Alan King Date: Thu, 9 Jan 2020 09:23:12 -0500 Subject: [PATCH] [#28] Add IRODS_PLUGIN_REVISION Aligns with IRODS_VERSION and adds a 4th digit to plugin version. Also removes unixfilesystem resource test from test hook. --- CMakeLists.txt | 8 +++----- irods_consortium_continuous_integration_test_hook.py | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bbabc5bf..a0f61b342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR) #CPACK_DEBIAN__PACKAGE_NAME find_package(IRODS 4.2.7 EXACT REQUIRED) +set(IRODS_PLUGIN_REVISION "1") set(CMAKE_C_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang) set(CMAKE_CXX_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang++) @@ -160,14 +161,11 @@ install( ) -set(CPACK_PACKAGE_FILE_NAME "irods-rule-engine-plugin-audit-amqp-${IRODS_VERSION}-${IRODS_LINUX_DISTRIBUTION_NAME}${IRODS_LINUX_DISTRIBUTION_VERSION_MAJOR}-${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF) set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY OFF) set(CPACK_COMPONENTS_GROUPING IGNORE) -set(CPACK_PACKAGE_VERSION ${IRODS_VERSION}) -set(CPACK_PACKAGE_VERSION_MAJOR ${IRODS_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${IRODS_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${IRODS_VERSION_PATCH}) +set(CPACK_PACKAGE_VERSION ${IRODS_VERSION}.${IRODS_PLUGIN_REVISION}) +set(CPACK_PACKAGE_FILE_NAME "irods-rule-engine-plugin-audit-amqp-${CPACK_PACKAGE_VERSION}-${IRODS_LINUX_DISTRIBUTION_NAME}${IRODS_LINUX_DISTRIBUTION_VERSION_MAJOR}-${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_PACKAGE_CONTACT "Renaissance Computing Institute ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The integrated Rule-Oriented Data System") set(CPACK_PACKAGE_VENDOR "Renaissance Computing Institute ") diff --git a/irods_consortium_continuous_integration_test_hook.py b/irods_consortium_continuous_integration_test_hook.py index 98b5f840d..7c79fb5b1 100644 --- a/irods_consortium_continuous_integration_test_hook.py +++ b/irods_consortium_continuous_integration_test_hook.py @@ -136,13 +136,10 @@ def main(): try: test_audit_log = 'log/test_audit_plugin.log' - test_output_file = 'log/test_output.log' irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'python2 scripts/run_tests.py --xml_output --run_s=test_audit_plugin 2>&1 | tee {0}; exit $PIPESTATUS'.format(test_audit_log)], check_rc=True) - irods_python_ci_utilities.subprocess_get_output(['sudo', 'su', '-', 'irods', '-c', 'python2 scripts/run_tests.py --xml_output --run_s=test_resource_types.Test_Resource_Unixfilesystem 2>&1 | tee {0}; exit $PIPESTATUS'.format(test_output_file)], check_rc=True) finally: if output_root_directory: irods_python_ci_utilities.gather_files_satisfying_predicate('/var/lib/irods/log', output_root_directory, lambda x: True) - shutil.copy('/var/lib/irods/log/test_output.log', output_root_directory) shutil.copy('/var/lib/irods/log/test_audit_plugin.log', output_root_directory)