Commit 9cf41b36 authored by Antoine Regimbeau's avatar Antoine Regimbeau
Browse files

Merge branch '1834-test-data-lfs-registry' into 'develop'

Factorize build images specification

See merge request orfeotoolbox/otb!429
No related merge requests found
Showing with 3 additions and 2 deletions
+3 -2
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# GIT_STRATEGY=fetch (https://gitlab.com/gitlab-org/gitlab-runner/issues/3318) # GIT_STRATEGY=fetch (https://gitlab.com/gitlab-org/gitlab-runner/issues/3318)
variables: variables:
BUILD_IMAGE_REGISTRY: $CI_REGISTRY/gbonnefille/otb-build-env
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
GIT_DEPTH: "3" GIT_DEPTH: "3"
# Disable automatic checkout to let us fetch LFS before # Disable automatic checkout to let us fetch LFS before
...@@ -36,13 +37,13 @@ native-build: ...@@ -36,13 +37,13 @@ native-build:
extends: .general extends: .general
only: [merge_requests] only: [merge_requests]
stage: build stage: build
image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-native:18.04 image: $BUILD_IMAGE_REGISTRY/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
build:ubuntu-llvm: build:ubuntu-llvm:
extends: .general extends: .general
stage: build stage: build
image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-shark:18.04 image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-shark:18.04
script: script:
- ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-shark - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-shark
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