From e82394f399adc7364a89682d9b14e4fd426cdc0e Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Wed, 15 May 2019 16:51:35 +0200
Subject: [PATCH] Cleaning yml

---
 .gitlab-ci.yml | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a1ff866f7..2cb0cfde7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -106,7 +106,7 @@ ubuntu-superbuild-build:
   dependencies:
     - ubuntu-superbuild-prepare
 
-## Centos superbuild
+## CentOS superbuild
 centos-superbuild-prepare:
   extends: .common-prepare
   image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
@@ -122,41 +122,26 @@ centos-superbuild-build:
   dependencies:
     - centos-superbuild-prepare
 
+## MacOS superbuild
 macos-superbuild-prepare:
   tags:
     - macos
   only: [merge_requests, branches]
   extends: .common-prepare
-  stage: prepare
   before_script:
-    # Provision efficiently the local LFS cache before checkout
-    - git lfs fetch origin $CI_COMMIT_SHA
+    # No need to install lfs as this machine is persistent
     # Checkout the expected branch
     - git checkout -f -q $CI_COMMIT_SHA
   script:
     - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
-  artifacts:
-    expire_in: 24 hrs
-    paths:
-      # This recovers logs from superbuild build
-      - build/*/*/*/*.log
-      - sb_branch.txt
 
 macos-superbuild-build:
   tags:
     - macos
-  only: [merge_requests, branches]
   extends: .general
-  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
-    - ssh -o StrictHostKeyChecking=no -T git@gitlab.orfeo-toolbox.org
-  after_script:
-    - echo "Nothing to do for after_script"
+  only: [merge_requests, branches]
   script:
     - ctest -VV -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
+    - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild
   dependencies:
     - macos-superbuild-prepare
-- 
GitLab