From 10fcc9bd79256995d92086dc2a37cba7420b8127 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 25 Feb 2019 15:59:28 +0100
Subject: [PATCH] CI: use docker images from gbonnefille registry
---
.gitlab-ci.yml | 7 ++++---
CI/configure_option.cmake | 2 +-
CI/ubuntu-18.04-gcc.cmake | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ccf249236..17a1e5258f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
variables:
DOCKER_DRIVER: overlay2
+ GIT_DEPTH: "3"
stages:
- build
@@ -17,13 +18,13 @@ stages:
native-build:
extends: .general
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:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc
shark-build:
extends: .general
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:
- - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4
\ No newline at end of file
+ - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4
diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake
index 183759a1c1..1b431e5cae 100644
--- a/CI/configure_option.cmake
+++ b/CI/configure_option.cmake
@@ -48,7 +48,7 @@ OTB_USE_OPENGL:BOOL=ON
OTB_USE_OPENMP:BOOL=ON
OTB_USE_QT: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_SPTW:BOOL=ON
OTB_USE_SSE_FLAGS:BOOL=ON")
diff --git a/CI/ubuntu-18.04-gcc.cmake b/CI/ubuntu-18.04-gcc.cmake
index 80e079b53c..0b2efec855 100644
--- a/CI/ubuntu-18.04-gcc.cmake
+++ b/CI/ubuntu-18.04-gcc.cmake
@@ -21,4 +21,5 @@
# Configuration options for ubuntu-18.04-gcc
set(site_option
-"opencv_INCLUDE_DIR:PATH=/usr/include")
+"opencv_INCLUDE_DIR:PATH=/usr/include
+OTB_USE_SHARK:BOOL=OFF")
--
GitLab