Commit 9f7ea21f authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

CI: clean YAML and make QA jobs optional

parent f9df6d8a
Pipeline #2146 passed with stages
in 64 minutes and 53 seconds
...@@ -47,7 +47,6 @@ stages: ...@@ -47,7 +47,6 @@ stages:
- merge_requests - merge_requests
- develop - develop
- /^release-[0-9]+\.[0-9]+$/ - /^release-[0-9]+\.[0-9]+$/
- ci_coverage
stage: build stage: build
artifacts: artifacts:
when: always when: always
...@@ -71,7 +70,6 @@ stages: ...@@ -71,7 +70,6 @@ stages:
- merge_requests - merge_requests
- develop - develop
- /^release-[0-9]+\.[0-9]+$/ - /^release-[0-9]+\.[0-9]+$/
- ci_coverage
stage: prepare stage: prepare
before_script: before_script:
- export GIT_LFS_SKIP_SMUDGE=1 - export GIT_LFS_SKIP_SMUDGE=1
...@@ -85,25 +83,26 @@ stages: ...@@ -85,25 +83,26 @@ stages:
- build/*/*/*/*.log # Superbuild log - build/*/*/*/*.log # Superbuild log
#-------------------------- precheck job --------------------------------------- #-------------------------- precheck job ---------------------------------------
#~ fast-build: fast-build:
#~ extends: .common extends: .common
#~ only: [merge_requests, branches] only: [merge_requests, branches]
#~ stage: precheck stage: precheck
#~ image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native-develop:latest image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native-develop:latest
#~ before_script: before_script:
#~ - export GIT_LFS_SKIP_SMUDGE=1 - export GIT_LFS_SKIP_SMUDGE=1
#~ - git checkout -f -q $CI_COMMIT_SHA - git checkout -f -q $CI_COMMIT_SHA
#~ - python3 CI/check_twin_pipelines.py - python3 CI/check_twin_pipelines.py
#~ script: script:
#~ - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast
#~ - ccache -s - ccache -s
#------------------------- prepare & build jobs -------------------------------- #------------------------- prepare & build jobs --------------------------------
#~ debian-build: debian-build:
#~ extends: .common-build extends: .common-build
#~ image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
#~ script: 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 - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc
dependencies: []
## Ubuntu superbuild ## Ubuntu superbuild
ubuntu-xdk-prepare: ubuntu-xdk-prepare:
...@@ -112,115 +111,122 @@ ubuntu-xdk-prepare: ...@@ -112,115 +111,122 @@ ubuntu-xdk-prepare:
script: script:
- ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
#~ ubuntu-xdk-build: ubuntu-xdk-build:
#~ extends: .common-build extends: .common-build
#~ image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04 image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
#~ script: script:
#~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-xdk - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-xdk
#~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base -DNAME_SUFFIX:string=-glibc-2.27 - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base -DNAME_SUFFIX:string=-glibc-2.27
#~ dependencies: dependencies:
#~ - ubuntu-xdk-prepare - ubuntu-xdk-prepare
## CentOS superbuild ## CentOS superbuild
#~ centos-xdk-prepare: centos-xdk-prepare:
#~ extends: .common-prepare extends: .common-prepare
#~ image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
#~ script: script:
#~ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~ centos-xdk-build: centos-xdk-build:
#~ extends: .common-build extends: .common-build
#~ image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
#~ script: 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 - 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
#~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
#~ dependencies: dependencies:
#~ - centos-xdk-prepare - centos-xdk-prepare
## MacOS superbuild ## MacOS superbuild
#~ macos-xdk-prepare: macos-xdk-prepare:
#~ extends: .common-prepare extends: .common-prepare
#~ tags: tags:
#~ - macos - macos
#~ script: script:
#~ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~ macos-xdk-build: macos-xdk-build:
#~ tags: tags:
#~ - macos - macos
#~ extends: .common-build extends: .common-build
#~ script: script:
#~ - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~ - ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild - ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild
#~ dependencies: dependencies:
#~ - macos-xdk-prepare - macos-xdk-prepare
## Windows ## Windows
#~ .windows-prepare: .windows-prepare:
#~ extends: .common-prepare extends: .common-prepare
#~ before_script: before_script:
#~ # This override the previous before_script # This override the previous before_script
#~ - set GIT_LFS_SKIP_SMUDGE=1 - set GIT_LFS_SKIP_SMUDGE=1
#~ - git checkout -f -q %CI_COMMIT_SHA% - git checkout -f -q %CI_COMMIT_SHA%
#~ - set GIT_LFS_SKIP_SMUDGE=0 - set GIT_LFS_SKIP_SMUDGE=0
#~
#~ .windows-build: .windows-build:
#~ extends: .common-build extends: .common-build
#~ before_script: before_script:
#~ - git lfs fetch origin %CI_COMMIT_SHA% - git lfs fetch origin %CI_COMMIT_SHA%
#~ - git checkout -f -q %CI_COMMIT_SHA% - git checkout -f -q %CI_COMMIT_SHA%
# - Win10 # - Win10
#~ windows-10-prepare: windows-10-prepare:
#~ extends: .windows-prepare extends: .windows-prepare
#~ tags: tags:
#~ - windows10 - windows10
#~ script: script:
#~ - call ./CI/dev_env.bat x64 xdk 10 - call ./CI/dev_env.bat x64 xdk 10
#~ - clcache.exe -s - clcache.exe -s
#~ - ctest -C Release -V -S CI/prepare_superbuild.cmake - ctest -C Release -V -S CI/prepare_superbuild.cmake
#~ - clcache.exe -s - clcache.exe -s
#~
#~ windows-10-build: windows-10-build:
#~ extends: .windows-build extends: .windows-build
#~ tags: tags:
#~ - windows10 - windows10
#~ script: script:
#~ - call ./CI/dev_env.bat x64 otb 10 - call ./CI/dev_env.bat x64 otb 10
#~ - clcache.exe -s - clcache.exe -s
#~ - ctest -V -S CI/main_superbuild.cmake - ctest -V -S CI/main_superbuild.cmake
#~ - clcache.exe -s - clcache.exe -s
#~ - ctest -V -S CI/main_packages.cmake - ctest -V -S CI/main_packages.cmake
#~ dependencies: dependencies:
#~ - windows-10-prepare - windows-10-prepare
# - Win8.1 # - Win8.1
#~ windows-8-prepare: windows-8-prepare:
#~ extends: .windows-prepare extends: .windows-prepare
#~ tags: tags:
#~ - windows8 - windows8
#~ script: script:
#~ - call ./CI/dev_env.bat x86 xdk 8.1 - call ./CI/dev_env.bat x86 xdk 8.1
#~ - clcache.exe -s - clcache.exe -s
#~ - ctest -C Release -V -S CI/prepare_superbuild.cmake - ctest -C Release -V -S CI/prepare_superbuild.cmake
#~ - clcache.exe -s - clcache.exe -s
#~
#~ windows-8-build: windows-8-build:
#~ extends: .windows-build extends: .windows-build
#~ tags: tags:
#~ - windows8 - windows8
#~ script: script:
#~ - call ./CI/dev_env.bat x86 otb 8.1 - call ./CI/dev_env.bat x86 otb 8.1
#~ - clcache.exe -s - clcache.exe -s
#~ - ctest -V -S CI/main_superbuild.cmake - ctest -V -S CI/main_superbuild.cmake
#~ - clcache.exe -s - clcache.exe -s
#~ - ctest -V -S CI/main_packages.cmake - ctest -V -S CI/main_packages.cmake
#~ dependencies: dependencies:
#~ - windows-8-prepare - windows-8-prepare
#------------------------- QA related jobs ------------------------------------- #------------------------- QA related jobs -------------------------------------
ubuntu-xdk-qa-code-coverage: ubuntu-xdk-qa-code-coverage:
extends: .common-build extends: .common-build
only:
refs:
- merge_requests
- develop
- /^release-[0-9]+\.[0-9]+$/
variables:
- $SONAR_OTB_TOKEN
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04 image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04
script: script:
- xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96"
...@@ -231,12 +237,18 @@ ubuntu-xdk-qa-code-coverage: ...@@ -231,12 +237,18 @@ ubuntu-xdk-qa-code-coverage:
- saxon-xslt -o build/ctest_report.xml - saxon-xslt -o build/ctest_report.xml
build/Testing/`head -n 1 build/Testing/TAG`/Test.xml build/Testing/`head -n 1 build/Testing/TAG`/Test.xml
CI/ctest2junit.xsl CI/ctest2junit.xsl
#~ after_script: []
dependencies: dependencies:
- ubuntu-xdk-prepare - ubuntu-xdk-prepare
ubuntu-xdk-qa-static-analysis: ubuntu-xdk-qa-static-analysis:
extends: .common-build extends: .common-build
only:
refs:
- merge_requests
- develop
- /^release-[0-9]+\.[0-9]+$/
variables:
- $SONAR_OTB_TOKEN
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04 image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04
script: script:
- find Modules -type f -regextype posix-extended -regex '.*\.(h|hxx)$' -exec dirname '{}' \; | - find Modules -type f -regextype posix-extended -regex '.*\.(h|hxx)$' -exec dirname '{}' \; |
...@@ -258,10 +270,12 @@ ubuntu-xdk-report: ...@@ -258,10 +270,12 @@ ubuntu-xdk-report:
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04 image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04
stage: report stage: report
only: only:
- merge_requests refs:
- develop - merge_requests
- /^release-[0-9]+\.[0-9]+$/ - develop
- ci_coverage - /^release-[0-9]+\.[0-9]+$/
variables:
- $SONAR_OTB_TOKEN
script: script:
- sonar-scanner -Dproject.settings=sonar-project.properties - sonar-scanner -Dproject.settings=sonar-project.properties
-Dsonar.host.url=https://sonar.orfeo-toolbox.org -Dsonar.host.url=https://sonar.orfeo-toolbox.org
...@@ -275,40 +289,40 @@ ubuntu-xdk-report: ...@@ -275,40 +289,40 @@ ubuntu-xdk-report:
- ubuntu-xdk-qa-static-analysis - ubuntu-xdk-qa-static-analysis
#---------------------------- Deploy job --------------------------------------- #---------------------------- Deploy job ---------------------------------------
#~ deploy: deploy:
#~ tags: tags:
#~ - deploy - deploy
#~ image: $BUILD_IMAGE_REGISTRY/otb-alpine:3.7 image: $BUILD_IMAGE_REGISTRY/otb-alpine:3.7
#~ stage: deploy stage: deploy
#~ extends: .general extends: .general
#~ only: only:
#~ - develop@orfeotoolbox/otb - develop@orfeotoolbox/otb
#~ - /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb - /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
#~ before_script: before_script:
#~ # Provision efficiently the local LFS cache before checkout # Provision efficiently the local LFS cache before checkout
#~ - git lfs fetch origin $CI_COMMIT_SHA - git lfs fetch origin $CI_COMMIT_SHA
#~ - git checkout -f -q $CI_COMMIT_SHA - git checkout -f -q $CI_COMMIT_SHA
#~ script: script:
#~ - ./CI/deploy.sh $CI_COMMIT_REF_NAME $RC_NUMBER - ./CI/deploy.sh $CI_COMMIT_REF_NAME $RC_NUMBER
#~ dependencies: dependencies:
#~ - ubuntu-xdk-build - ubuntu-xdk-build
#~ - centos-xdk-build - centos-xdk-build
#~ - macos-xdk-build - macos-xdk-build
#~ - windows-8-build - windows-8-build
#~ - windows-10-build - windows-10-build
#~
#~ release-container: release-container:
#~ image: $BUILD_IMAGE_REGISTRY/otb-alpine:3.7 image: $BUILD_IMAGE_REGISTRY/otb-alpine:3.7
#~ stage: deploy stage: deploy
#~ extends: .general extends: .general
#~ only: only:
#~ refs: refs:
#~ - tags@orfeotoolbox/otb - tags@orfeotoolbox/otb
#~ variables: variables:
#~ - $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/ - $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
#~ script: script:
#~ - curl --request POST - curl --request POST
#~ --form token=$K8S_SECRET_RELEASE --form token=$K8S_SECRET_RELEASE
#~ --form ref=master --form ref=master
#~ --form variables[OTB_TAG]=$CI_COMMIT_TAG --form variables[OTB_TAG]=$CI_COMMIT_TAG
#~ https://gitlab.orfeo-toolbox.org/api/v4/projects/126/trigger/pipeline https://gitlab.orfeo-toolbox.org/api/v4/projects/126/trigger/pipeline
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment