From c1363153557b60aed354931459163aada2495a08 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 15 Apr 2019 12:13:24 +0200
Subject: [PATCH] CI: use fast build as precheck
---
.gitlab-ci.yml | 6 +++++-
CI/main_ci.cmake | 13 +++++++++----
CI/ubuntu-18.04-fast.cmake | 2 ++
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ab3b8a471..21b3d9a889 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,9 +43,13 @@ fast-build:
extends: .general
only: [merge_requests, branches]
stage: precheck
- image: $CI_REGISTRY/gpasero/otb-install-ubuntu-native
+ image: $CI_REGISTRY/gpasero/otb/otb-install-ubuntu-native
+ before_script:
+ - python3 CI/check_twin_pipelines.py
+ - git checkout $CI_COMMIT_REF_NAME
script:
- ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast
+ - ccache -s
debian-build:
extends: .general
diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake
index 1edbf1718c..eb8aa84eec 100644
--- a/CI/main_ci.cmake
+++ b/CI/main_ci.cmake
@@ -130,10 +130,15 @@ if ( NOT _build_rv EQUAL 0 )
message( SEND_ERROR "An error occurs during ctest_build.")
endif()
-ctest_test(PARALLEL_LEVEL 8
- RETURN_VALUE _test_rv
- CAPTURE_CMAKE_ERROR _test_error
- )
+if(ci_skip_testing)
+ message(STATUS "Skip testing")
+ set(_test_rv 0)
+else()
+ ctest_test(PARALLEL_LEVEL 8
+ RETURN_VALUE _test_rv
+ CAPTURE_CMAKE_ERROR _test_error
+ )
+endif()
if ( NOT _test_rv EQUAL 0 )
message( SEND_ERROR "An error occurs during ctest_test.")
diff --git a/CI/ubuntu-18.04-fast.cmake b/CI/ubuntu-18.04-fast.cmake
index 21c2a456c7..5ba38ec80c 100644
--- a/CI/ubuntu-18.04-fast.cmake
+++ b/CI/ubuntu-18.04-fast.cmake
@@ -31,3 +31,5 @@ CMAKE_C_COMPILER_LAUNCHER:STRING=ccache
CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache
OTB_USE_SHARK:BOOL=OFF
BUILD_EXAMPLES:BOOL=OFF")
+
+set(ci_skip_testing ON)
--
GitLab