From f597adf594d05f08a51d3411fc9254dcbc073d1b Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Wed, 15 May 2019 19:22:14 +0200
Subject: [PATCH] Put back fast build
---
.gitlab-ci.yml | 28 ++++++++++++++--------------
CI/main_superbuild.cmake | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3da9e139be..65def7b43a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
GIT_STRATEGY: "clone"
stages:
- # - precheck
+ - precheck
- prepare
- build
@@ -30,19 +30,19 @@ stages:
- runner_system_failure
- stuck_or_timeout_failure
-# fast-build:
-# extends: .general
-# only: [merge_requests, branches]
-# stage: precheck
-# image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native-develop:latest
-# before_script:
-# - git checkout -f -q $CI_COMMIT_SHA
-# - python3 CI/check_twin_pipelines.py
-# after_script:
-# - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH $CI_MERGE_REQUEST_REF_PATH
-# script:
-# - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast
-# - ccache -s
+fast-build:
+ extends: .general
+ only: [merge_requests, branches]
+ stage: precheck
+ image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native-develop:latest
+ before_script:
+ - git checkout -f -q $CI_COMMIT_SHA
+ - python3 CI/check_twin_pipelines.py
+ after_script:
+ - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH $CI_MERGE_REQUEST_REF_PATH
+ script:
+ - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast
+ - ccache -s
.common-build:
extends: .general
diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake
index e3c5141827..f0cdf59053 100644
--- a/CI/main_superbuild.cmake
+++ b/CI/main_superbuild.cmake
@@ -50,7 +50,7 @@ find_program(CTEST_GIT_COMMAND NAMES git git.cmd)
# FIXME: Replace ${GIT} variable with $[CTEST_GIT_COMMAND}"
set( GIT "${CTEST_GIT_COMMAND}" )
-set( DEBUG 1 )
+
execute_process(
COMMAND ${GIT} "clone" "${REMOTE}" "--branch" "${BRANCH_NAME}"
"--depth" "1" "superbuild-artifact"
--
GitLab