Merge pull request #1976 from bilke/declarative-pipeline

Declarative Jenkins pipeline
ufz · Nov 21, 2017 · cc4363e · cc4363e
2 parents 752a92f + 83a99c0
commit cc4363e
Show file tree

Hide file tree

Showing 14 changed files with 395 additions and 470 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,6 @@ trim_trailing_whitespace = false
 
 [*.{json,yml,toml}]
 indent_size = 2
+
+[Jenkinsfile]
+indent_size = 2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -235,11 +235,6 @@ if (OGS_FATAL_ABORT)
     add_definitions(-DOGS_FATAL_ABORT)
 endif()
 
-if(OGS_BUILD_TESTS)
-    set(Data_SOURCE_DIR ${PROJECT_SOURCE_DIR}/Tests/lfs-data CACHE INTERNAL "")
-    set(Data_BINARY_DIR ${PROJECT_BINARY_DIR}/Tests/lfs-data CACHE INTERNAL "")
-endif()
-
 # Logging level
 add_definitions(-DLOGOG_LEVEL=${OGS_LOG_LEVEL})