From e05dab55b6f88c117b741de5c6a6be645ad66a8b Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Wed, 15 May 2019 10:42:36 +0200
Subject: [PATCH] Add debug trace in main_superbuild
---
.gitlab-ci.yml | 21 +++++++++------------
CI/main_superbuild.cmake | 2 +-
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71967f814d..bac84806a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,15 +18,6 @@ variables:
# The fetch strategy fails with LFS and GitLab
GIT_STRATEGY: "clone"
-before_script:
- # Provision efficiently the local LFS cache before checkout
- - git lfs fetch origin $CI_COMMIT_SHA
- # Checkout the expected branch
- - git checkout -f -q $CI_COMMIT_SHA
-
-after_script:
- - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH
-
stages:
- precheck
- prepare
@@ -48,6 +39,8 @@ fast-build:
- export GIT_LFS_SKIP_SMUDGE=1
- 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
script:
- ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast
- ccache -s
@@ -56,6 +49,13 @@ fast-build:
extends: .general
only: [merge_requests]
stage: build
+ before_script:
+ # Provision efficiently the local LFS cache before checkout
+ - git lfs fetch origin $CI_COMMIT_SHA
+ # Checkout the expected branch
+ - git checkout -f -q $CI_COMMIT_SHA
+ after_script:
+ - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH
debian-build:
extends: .common-build
@@ -79,12 +79,9 @@ ubuntu-llvm:
only: [merge_requests]
stage: prepare
before_script:
-# This override the previous before_script
- export GIT_LFS_SKIP_SMUDGE=1
- git checkout -f -q $CI_COMMIT_SHA
- export GIT_LFS_SKIP_SMUDGE=0
- after_script:
- - echo "Nothing to do for after_script"
artifacts:
expire_in: 24 hrs
paths:
diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake
index a7ba0f96d7..84d0b12377 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