From a9681e7d99b19843e435a74cebb00e6302b9db21 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Fri, 1 Feb 2019 10:58:00 +0100
Subject: [PATCH] Change dockerfile name
---
.gitlab-ci.yml | 13 ++++++++-----
.../Dockerfile => Dockerfile.shark1.3.4} | 0
2 files changed, 8 insertions(+), 5 deletions(-)
rename CI/{SharkDockerfile/Dockerfile => Dockerfile.shark1.3.4} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86472f6cba..b39bdce0aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,13 +11,16 @@ stages:
- runner_system_failure
- stuck_or_timeout_failure
-build:ubuntu-18.04:release:
+natif-build:
extends: .retry_twice
stage: build
image: registry.orfeo-toolbox.org/sdinot/otb:ubuntu-18.04-gcc
script:
- ctest -S CI/main_ci.cmake
- artifacts:
- expire_in: 1 week
- paths:
- - build/Testing/*/Test.xml
+
+shark-build:
+ extends: .retry_twice
+ stage: build
+ image: registry.orfeo-toolbox.org/sdinot/otb:ubuntu18.04-shark3.1.4
+ script:
+ - ctest -VV -S CI/main_ci.cmake
\ No newline at end of file
diff --git a/CI/SharkDockerfile/Dockerfile b/CI/Dockerfile.shark1.3.4
similarity index 100%
rename from CI/SharkDockerfile/Dockerfile
rename to CI/Dockerfile.shark1.3.4
--
GitLab