CI: YAML cleaning

.gitlab-ci.yml

@@ -53,17 +53,19 @@ fast-build:
     - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast
     - ccache -s
 
-debian-build:
+.common-build:
   extends: .general
   only: [merge_requests]
   stage: build
+
+debian-build:
+  extends: .common-build
   image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
   script:
     - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc
 
-.common-build:
-  extends: .general
-  stage: build
+ubuntu-llvm:
+  extends: .common-build
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native:18.04
   script:
     - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm
@@ -73,15 +75,10 @@ debian-build:
       - build/Documentation/Cookbook/latex/CookBook-*.pdf
       - build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2
 
-ubuntu-llvm:
-  only: [merge_requests]
-  extends: .common-build
-
 .common-prepare:
-  # only: [merge_requests]
   extends: .general
+  only: [merge_requests]
   stage: prepare
-  # image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
   before_script:
 # This override the previous before_script
     - git checkout $CI_COMMIT_REF_NAME
@@ -95,8 +92,6 @@ ubuntu-llvm:
     - ssh-add <(echo "$K8S_SECRET_SSH")
 # This is for debug, we are checking the owner of the ssh key
     - ssh -o StrictHostKeyChecking=no -T git@gitlab.orfeo-toolbox.org
-  # script:
-  #  - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
   after_script:
     - echo "Nothing to do for after_script"
   artifacts:
@@ -107,23 +102,19 @@ ubuntu-llvm:
       - sb_branch.txt
 
 ubuntu-superbuild-prepare:
-  only: [merge_requests]
   extends: .common-prepare
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
   script:
     - ctest -V -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
 
 centos-superbuild-prepare:
-  only: [merge_requests]
   extends: .common-prepare
   image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
   script:
     - ctest -V -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
 
 ubuntu-superbuild-build:
-  only: [merge_requests]
   extends: .common-build
-  stage: build
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
   script:
     - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
@@ -131,9 +122,7 @@ ubuntu-superbuild-build:
     - ubuntu-superbuild-prepare
 
 centos-superbuild-build:
-  only: [merge_requests]
-  extends: .general
-  stage: build
+  extends: .common-build
   image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
   script:
     - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base