Commit cba6148b authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

Revert "CI: add specific test, disable other platforms for now"

This reverts commit 82c06589.
parent b764fe72
...@@ -64,11 +64,11 @@ fast-build: ...@@ -64,11 +64,11 @@ fast-build:
- build/*/*.log #CMake log - build/*/*.log #CMake log
- log/*.txt # Others - log/*.txt # Others
#~ debian-build: debian-build:
#~ extends: .common-build extends: .common-build
#~ image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
#~ script: script:
#~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc
.common-prepare: .common-prepare:
extends: .general extends: .general
...@@ -108,42 +108,42 @@ ubuntu-superbuild-build: ...@@ -108,42 +108,42 @@ ubuntu-superbuild-build:
- build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2 - build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2
## CentOS superbuild ## CentOS superbuild
#~ centos-superbuild-prepare: centos-superbuild-prepare:
#~ extends: .common-prepare extends: .common-prepare
#~ image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
#~ script: script:
#~ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~
#~ centos-superbuild-build: centos-superbuild-build:
#~ extends: .common-build extends: .common-build
#~ image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
#~ script: script:
#~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~ dependencies: dependencies:
#~ - centos-superbuild-prepare - centos-superbuild-prepare
## MacOS superbuild ## MacOS superbuild
#~ macos-superbuild-prepare: macos-superbuild-prepare:
#~ tags: tags:
#~ - macos - macos
#~ extends: .common-prepare extends: .common-prepare
#~ before_script: before_script:
#~ # No need to install lfs as this machine is persistent # No need to install lfs as this machine is persistent
#~ # No need to do git config # No need to do git config
#~ # Checkout the expected branch # Checkout the expected branch
#~ - export GIT_LFS_SKIP_SMUDGE=1 - export GIT_LFS_SKIP_SMUDGE=1
#~ - git checkout -f -q $CI_COMMIT_SHA - git checkout -f -q $CI_COMMIT_SHA
#~ - export GIT_LFS_SKIP_SMUDGE=0 - export GIT_LFS_SKIP_SMUDGE=0
#~ script: script:
#~ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~
#~ macos-superbuild-build: macos-superbuild-build:
#~ tags: tags:
#~ - macos - macos
#~ extends: .common-build extends: .common-build
#~ script: script:
#~ - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~ - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~ dependencies: dependencies:
#~ - macos-superbuild-prepare - macos-superbuild-prepare
...@@ -41,7 +41,7 @@ BUILD_DOCUMENTATION:BOOL=ON ...@@ -41,7 +41,7 @@ BUILD_DOCUMENTATION:BOOL=ON
OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-4.13.0 OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-4.13.0
OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\" OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\"
") ")
# set (ENABLE_DOXYGEN ON) set (ENABLE_DOXYGEN ON)
# The ITK doxygen tag file needs to be patched before being used for OTB # The ITK doxygen tag file needs to be patched before being used for OTB
# See otb-devutils/Scripts/tagfile_fix.py # See otb-devutils/Scripts/tagfile_fix.py
message(STATUS "Get resources for Doxygen build ...") message(STATUS "Get resources for Doxygen build ...")
......
...@@ -34,11 +34,6 @@ otb_add_test(NAME trTeTutorialsPipelineTest COMMAND ${OTB_TEST_DRIVER} ...@@ -34,11 +34,6 @@ otb_add_test(NAME trTeTutorialsPipelineTest COMMAND ${OTB_TEST_DRIVER}
${TEMP}/TutorialsPipelineOutput.png ${TEMP}/TutorialsPipelineOutput.png
) )
otb_add_test(NAME trTeTutorialsPipelineTestDirect COMMAND $<TARGET_FILE:Pipeline>
${INPUTDATA}/QB_Suburb.png
${TEMP}/TutorialsPipelineOutput.png
)
otb_add_test(NAME trTeTutorialsFilteringPipelineTest COMMAND ${OTB_TEST_DRIVER} otb_add_test(NAME trTeTutorialsFilteringPipelineTest COMMAND ${OTB_TEST_DRIVER}
--compare-image ${NOTOL} --compare-image ${NOTOL}
${BASELINE}/TutorialsFilteringPipelineOutput.png ${BASELINE}/TutorialsFilteringPipelineOutput.png
......
Markdown is supported
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