Commit 6943673e authored by Antoine Regimbeau's avatar Antoine Regimbeau
Browse files

Merge branch 'packaging_ci' into superbuild_ci-macos

No related merge requests found
Showing with 35 additions and 5 deletions
+35 -5
...@@ -57,6 +57,12 @@ fast-build: ...@@ -57,6 +57,12 @@ fast-build:
- git checkout -f -q $CI_COMMIT_SHA - git checkout -f -q $CI_COMMIT_SHA
after_script: after_script:
- python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH $CI_MERGE_REQUEST_REF_PATH - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH $CI_MERGE_REQUEST_REF_PATH
artifacts:
when: on_failure
expire_in: 24 hrs
paths:
- log/*.txt
debian-build: debian-build:
extends: .common-build extends: .common-build
......
...@@ -133,7 +133,7 @@ set (CONFIGURE_OPTIONS "") ...@@ -133,7 +133,7 @@ set (CONFIGURE_OPTIONS "")
include ( "${CMAKE_CURRENT_LIST_DIR}/configure_options.cmake" ) include ( "${CMAKE_CURRENT_LIST_DIR}/configure_options.cmake" )
# For superbuild we need remote module # For superbuild we need remote module
foreach(remote_module SertitObject Mosaic otbGRM DiapOTBModule OTBTemporalGapFilling) foreach(remote_module otbGRM DiapOTBModule OTBTemporalGapFilling) #Mosaic # #SertitObject
set ( CONFIGURE_OPTIONS set ( CONFIGURE_OPTIONS
"${CONFIGURE_OPTIONS}-DModule_${remote_module}:BOOL=ON;") "${CONFIGURE_OPTIONS}-DModule_${remote_module}:BOOL=ON;")
endforeach() endforeach()
...@@ -167,6 +167,11 @@ ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" ...@@ -167,6 +167,11 @@ ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}"
RETURN_VALUE _configure_rv RETURN_VALUE _configure_rv
CAPTURE_CMAKE_ERROR _configure_error CAPTURE_CMAKE_ERROR _configure_error
) )
# Configure log
file ( WRITE
"${OTB_SOURCE_DIR}/log/configure_return_value_log.txt" "${_configure_rv}")
file ( WRITE
"${OTB_SOURCE_DIR}/log/configure_cmake_error_log.txt" "${_configure_error}")
if ( NOT _configure_rv EQUAL 0 ) if ( NOT _configure_rv EQUAL 0 )
ctest_submit() ctest_submit()
...@@ -178,6 +183,14 @@ ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" ...@@ -178,6 +183,14 @@ ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
CAPTURE_CMAKE_ERROR _build_error CAPTURE_CMAKE_ERROR _build_error
) )
# Build log
file ( WRITE
"${OTB_SOURCE_DIR}/log/build_return_value_log.txt" "${_build_rv}")
file ( WRITE
"${OTB_SOURCE_DIR}/log/build_cmake_error_log.txt" "${_build_error}")
# SEND_ERROR if build error
# FATAL_ERROR if build error?
if ( NOT _build_rv EQUAL 0 ) if ( NOT _build_rv EQUAL 0 )
message( SEND_ERROR "An error occurs during ctest_build.") message( SEND_ERROR "An error occurs during ctest_build.")
endif() endif()
...@@ -188,6 +201,12 @@ ctest_test(PARALLEL_LEVEL 8 ...@@ -188,6 +201,12 @@ ctest_test(PARALLEL_LEVEL 8
CAPTURE_CMAKE_ERROR _test_error CAPTURE_CMAKE_ERROR _test_error
) )
# Test log
file ( WRITE
"${OTB_SOURCE_DIR}/log/test_return_value_log.txt" "${_test_rv}")
file ( WRITE
"${OTB_SOURCE_DIR}/log/test_cmake_error_log.txt" "${_test_error}")
if ( NOT _test_rv EQUAL 0 ) if ( NOT _test_rv EQUAL 0 )
message( WARNING "Some tests have failed.") message( WARNING "Some tests have failed.")
endif() endif()
...@@ -199,7 +218,7 @@ set ( MAKE_COMMAND "make") ...@@ -199,7 +218,7 @@ set ( MAKE_COMMAND "make")
execute_process( execute_process(
COMMAND ${MAKE_COMMAND} "install" COMMAND ${MAKE_COMMAND} "install"
WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
RESULT_VARIABLE install_res RESULT_VARIABLE install_rv
OUTPUT_VARIABLE install_out OUTPUT_VARIABLE install_out
ERROR_VARIABLE install_err ERROR_VARIABLE install_err
) )
...@@ -211,7 +230,12 @@ if ( DEBUG ) ...@@ -211,7 +230,12 @@ if ( DEBUG )
message( "install_err = ${install_err}" ) message( "install_err = ${install_err}" )
endif() endif()
# Artifacts can only be in project dir... # Install log
# file ( COPY "${XDK_PATH}" DESTINATION "${OTB_SOURCE_DIR}/install") file ( WRITE
"${OTB_SOURCE_DIR}/log/install_out_log.txt" "${install_out}")
file ( WRITE
"${OTB_SOURCE_DIR}/log/install_error_log.txt" "${install_err}")
# include ( "${CMAKE_CURRENT_LIST_DIR}/main_packages.cmake" ) if ( NOT install_rv EQUAL 0 )
message( SEND_ERROR "Install have failed.")
endif()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment