diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b591a66295ae5ef572bfd667beb14d9182e939e..4846f1af32857c3156db2a8576770f0270c6dba5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2005-2020 Centre National d'Etudes Spatiales (CNES) +# Copyright (C) 2005-2021 Centre National d'Etudes Spatiales (CNES) # # This file is part of Orfeo Toolbox # @@ -170,17 +170,17 @@ ubuntu-xdk-build-doc: ## CentOS superbuild centos-xdk-prepare: extends: .common-prepare - image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:7.6.1810 + image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:7.9.2009 script: - - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=centos-7.6.1810-gcc + - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=centos-7.9.2009-gcc centos-xdk-build: extends: .common-build - image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:7.6.1810 + image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:7.9.2009 script: - export QT_QPA_PLATFORM=offscreen - - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=centos-7.6.1810-gcc - - ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=centos-7.6.1810-gcc + - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=centos-7.9.2009-gcc + - ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=centos-7.9.2009-gcc - mv build_packages/OTB-*.run . || true needs: - job: centos-xdk-prepare @@ -247,7 +247,7 @@ windows-10-build: needs: - job: windows-10-prepare artifacts: true - + #------------------------- QA related jobs ------------------------------------- ubuntu-xdk-qa-code-coverage: extends: .common-build diff --git a/.gitlab/merge_request_templates/request_for_changes.md b/.gitlab/merge_request_templates/request_for_changes.md index 79acdadae838587114d6aa593ddcf0a78a8ef3bd..e530e875f123ce1f9335b56c21511e22ac3daa03 100644 --- a/.gitlab/merge_request_templates/request_for_changes.md +++ b/.gitlab/merge_request_templates/request_for_changes.md @@ -20,7 +20,8 @@ Describe any changes made to existing applications, or new applications that hav