From 23c80139ca882a9be4f97e1e0a699d0e3f551078 Mon Sep 17 00:00:00 2001
From: Stephane ALBERT <stephane.albert@c-s.fr>
Date: Mon, 15 Apr 2019 10:53:33 +0200
Subject: [PATCH] ENH: enabled (back) ubuntu & debian pipelines.
---
.gitlab-ci.yml | 70 +++++++++++++++++++++++++-------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43ec00eb4e..3bd9f45f14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,21 +39,21 @@ stages:
- runner_system_failure
- stuck_or_timeout_failure
-# native-build:
-# extends: .general
-# only: [merge_requests]
-# stage: 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-gcc
-
-# debian-build:
-# extends: .general
-# only: [merge_requests]
-# stage: 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
+native-build:
+ extends: .general
+ only: [merge_requests]
+ stage: 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-gcc
+
+debian-build:
+ extends: .general
+ only: [merge_requests]
+ stage: 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
@@ -63,14 +63,14 @@ stages:
- 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-shark
-# # This is needed to have only one pipeline in a merge request context
-# ubuntu-llvm:
-# only: [merge_requests]
-# extends: .common-build
+# This is needed to have only one pipeline in a merge request context
+ubuntu-llvm:
+ only: [merge_requests]
+ extends: .common-build
-# ubuntu-llvm-wip:
-# except: [merge_requests]
-# extends: .common-build
+ubuntu-llvm-wip:
+ except: [merge_requests]
+ extends: .common-build
.common-prepare:
# only: [merge_requests]
@@ -101,12 +101,12 @@ stages:
- build/*/*/*/*.log
- sb_branch.txt
-# ubuntu-superbuild-prepare:
-# only: [merge_requests]
-# extends: .common-prepare
-# image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
-# script:
-# - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
+ubuntu-superbuild-prepare:
+ only: [merge_requests]
+ extends: .common-prepare
+ image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
+ script:
+ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
centos-superbuild-prepare:
only: [merge_requests, branches]
@@ -115,13 +115,13 @@ centos-superbuild-prepare:
script:
- ctest -VV -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:
-# - ctest -VV -S CI/build_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
+ubuntu-superbuild-build:
+ only: [merge_requests]
+ extends: .common-build
+ stage: build
+ image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
+ script:
+ - ctest -VV -S CI/build_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
centos-superbuild-build:
only: [merge_requests, branches]
--
GitLab