From 730d0816d863573dfc6aeb9d67d8d815da6e7b14 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Fri, 26 Apr 2019 17:38:20 +0200
Subject: [PATCH] Remove fast build and remove -F in ssh command
---
.gitlab-ci.yml | 24 ++++++++++++------------
CI/prepare_superbuild.cmake | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fa012707f..3b7051a602 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,18 +41,18 @@ 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:
- - export GIT_LFS_SKIP_SMUDGE=1
- - git checkout $CI_COMMIT_REF_NAME
- - python3 CI/check_twin_pipelines.py
- 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:
+# - export GIT_LFS_SKIP_SMUDGE=1
+# - git checkout $CI_COMMIT_REF_NAME
+# - python3 CI/check_twin_pipelines.py
+# 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/prepare_superbuild.cmake b/CI/prepare_superbuild.cmake
index da820a2386..47eec850c1 100644
--- a/CI/prepare_superbuild.cmake
+++ b/CI/prepare_superbuild.cmake
@@ -190,7 +190,7 @@ set ( SB_ARTIFACT_GIT "${OTB_SOURCE_DIR}/superbuild-artifact" )
# -F /dev/null so the agent is not taking a default file ~/.ssh/..
execute_process(
COMMAND ${GIT} "config" "core.sshCommand"
- "ssh -o StrictHostKeyChecking=no -F /dev/null"
+ "ssh -o StrictHostKeyChecking=no"
WORKING_DIRECTORY ${SB_ARTIFACT_GIT}
RESULT_VARIABLE ssh_res
OUTPUT_VARIABLE ssh_out
--
GitLab