Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
cba6148b
Commit
cba6148b
authored
Jun 07, 2019
by
Guillaume Pasero
Browse files
Revert "CI: add specific test, disable other platforms for now"
This reverts commit
82c06589
.
parent
b764fe72
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
cba6148b
...
...
@@ -64,11 +64,11 @@ fast-build:
-
build/*/*.log
#CMake log
-
log/*.txt
# Others
#~
debian-build:
#~
extends: .common-build
#~
image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
#~
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
debian-build
:
extends
:
.common-build
image
:
$BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
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
.common-prepare
:
extends
:
.general
...
...
@@ -108,42 +108,42 @@ ubuntu-superbuild-build:
-
build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2
## CentOS superbuild
#~
centos-superbuild-prepare:
#~
extends: .common-prepare
#~
image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
#~
script:
#~
- ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~
#~
centos-superbuild-build:
#~
extends: .common-build
#~
image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
#~
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 -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~
dependencies:
#~
- centos-superbuild-prepare
centos-superbuild-prepare
:
extends
:
.common-prepare
image
:
$BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
script
:
-
ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
centos-superbuild-build
:
extends
:
.common-build
image
:
$BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
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 -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
dependencies
:
-
centos-superbuild-prepare
## MacOS superbuild
#~
macos-superbuild-prepare:
#~
tags:
#~
- macos
#~
extends: .common-prepare
#~
before_script:
#~
# No need to install lfs as this machine is persistent
#~
# No need to do git config
#~
# Checkout the expected branch
#~
- export GIT_LFS_SKIP_SMUDGE=1
#~
- git checkout -f -q $CI_COMMIT_SHA
#~
- export GIT_LFS_SKIP_SMUDGE=0
#~
script:
#~
- ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~
#~
macos-superbuild-build:
#~
tags:
#~
- macos
#~
extends: .common-build
#~
script:
#~
- 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
#~
dependencies:
#~
- macos-superbuild-prepare
macos-superbuild-prepare
:
tags
:
-
macos
extends
:
.common-prepare
before_script
:
# No need to install lfs as this machine is persistent
# No need to do git config
# Checkout the expected branch
-
export GIT_LFS_SKIP_SMUDGE=1
-
git checkout -f -q $CI_COMMIT_SHA
-
export GIT_LFS_SKIP_SMUDGE=0
script
:
-
ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
macos-superbuild-build
:
tags
:
-
macos
extends
:
.common-build
script
:
-
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
dependencies
:
-
macos-superbuild-prepare
CI/ubuntu-18.04-llvm-xdk.cmake
View file @
cba6148b
...
...
@@ -41,7 +41,7 @@ BUILD_DOCUMENTATION:BOOL=ON
OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=
${
CTEST_BINARY_DIRECTORY
}
/InsightDoxygenDocTag-4.13.0
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
# See otb-devutils/Scripts/tagfile_fix.py
message
(
STATUS
"Get resources for Doxygen build ..."
)
...
...
Examples/Tutorials/test/CMakeLists.txt
View file @
cba6148b
...
...
@@ -34,11 +34,6 @@ otb_add_test(NAME trTeTutorialsPipelineTest COMMAND ${OTB_TEST_DRIVER}
${
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
}
--compare-image
${
NOTOL
}
${
BASELINE
}
/TutorialsFilteringPipelineOutput.png
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment