Merge branch 'develop' into ci_large_input

.gitlab-ci.yml

@@ -47,7 +47,10 @@ fast-build:
 
 .common-build:
   extends: .general
-  only: [merge_requests]
+  only:
+    - merge_requests
+    - develop
+    - /^release-[0-9]+\.[0-9]+$/
   stage: build
   before_script:
     - git lfs install --skip-repo
@@ -72,7 +75,10 @@ debian-build:
 
 .common-prepare:
   extends: .general
-  only: [merge_requests]
+  only:
+    - merge_requests
+    - develop
+    - /^release-[0-9]+\.[0-9]+$/
   stage: prepare
   before_script:
     - git checkout -f -q $CI_COMMIT_SHA

.gitlab/issue_templates/release.md

@@ -36,7 +36,6 @@ Once all blocking issues are closed, and the previous steps are done:
     * [ ] Software Guide
     * [ ] Cookbook
     * [ ] Doxygen
-    * [ ] Application online documentation
     * [ ] WordPress page "Home" and "Download" pages
 * [ ] Upload OTB source archive to [Zenodo](https://zenodo.org/) to create a unique Digital Object Identifier (DOI)
 * [ ] Send email to mailing list to announce the release

CMakeLists.txt

@@ -117,7 +117,7 @@ find_package ( PythonLibs )
 # Configure the default OTB_DATA_ROOT for the location of OTB Data.
 find_path(OTB_DATA_ROOT
   NAMES README-OTB-Data
-  HINTS ${OTB_SOURCE_DIR}/Data $ENV{OTB_DATA_ROOT}
+  HINTS ${OTB_SOURCE_DIR}/Data
   )
 #mark_as_advanced(OTB_DATA_ROOT)
 

SuperBuild/CMakeLists.txt

@@ -343,10 +343,10 @@ option(OTB_USE_MPI "Enable MPI in OTB" OFF)
 option(OTB_USE_SPTW "Enable Simple Parallel Tiff Writer in OTB" OFF)
 
 # set OTB_DATA_ROOT to run test
-find_path(OTB_DATA_ROOT README-OTB-Data
-  PATHS
-  $ENV{OTB_DATA_ROOT}
-  ${OTB-SuperBuild_SOURCE_DIR}/../../OTB-Data)
+find_path(OTB_DATA_ROOT
+  NAMES README-OTB-Data
+  HINTS ${OTB-SuperBuild_SOURCE_DIR}/../Data
+  )
 
 # SWIG Wrapping
 option(OTB_WRAP_PYTHON "Enable python wrappers for OTB applications (requires SWIG)" ON)