Commit 10fcc9bd authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

CI: use docker images from gbonnefille registry

parent 8a7a9329
Pipeline #290 passed with stage
in 55 minutes and 21 seconds
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
GIT_DEPTH: "3"
stages: stages:
- build - build
...@@ -17,13 +18,13 @@ stages: ...@@ -17,13 +18,13 @@ stages:
native-build: native-build:
extends: .general extends: .general
stage: build stage: build
image: registry.orfeo-toolbox.org/orfeotoolbox/otb:ubuntu-18.04-gcc image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-native:18.04
script: script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc
shark-build: shark-build:
extends: .general extends: .general
stage: build stage: build
image: registry.orfeo-toolbox.org/orfeotoolbox/otb:ubuntu-18.04-gcc-shark-3.1.4 image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-shark:18.04
script: script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4 - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4
\ No newline at end of file
...@@ -48,7 +48,7 @@ OTB_USE_OPENGL:BOOL=ON ...@@ -48,7 +48,7 @@ OTB_USE_OPENGL:BOOL=ON
OTB_USE_OPENMP:BOOL=ON OTB_USE_OPENMP:BOOL=ON
OTB_USE_QT:BOOL=ON OTB_USE_QT:BOOL=ON
OTB_USE_QWT:BOOL=ON OTB_USE_QWT:BOOL=ON
OTB_USE_SHARK:BOOL=$ENV{OTB_USESHARK} OTB_USE_SHARK:BOOL=ON
OTB_USE_SIFTFAST:BOOL=ON OTB_USE_SIFTFAST:BOOL=ON
OTB_USE_SPTW:BOOL=ON OTB_USE_SPTW:BOOL=ON
OTB_USE_SSE_FLAGS:BOOL=ON") OTB_USE_SSE_FLAGS:BOOL=ON")
......
...@@ -21,4 +21,5 @@ ...@@ -21,4 +21,5 @@
# Configuration options for ubuntu-18.04-gcc # Configuration options for ubuntu-18.04-gcc
set(site_option set(site_option
"opencv_INCLUDE_DIR:PATH=/usr/include") "opencv_INCLUDE_DIR:PATH=/usr/include
OTB_USE_SHARK:BOOL=OFF")
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