Просмотр исходного кода

Merge topic 'ci-nightly-ide-jobs'

e5698605d7 gitlab-ci: ignore failing tests for external IDE testing
beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs
18d6737e96 gitlab-ci: always upload test and release artifacts

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5871
Brad King 4 лет назад
Родитель
Сommit
594483728c
4 измененных файлов с 9 добавлено и 0 удалено
  1. 4 0
      .gitlab/artifacts.yml
  2. 2 0
      .gitlab/os-macos.yml
  3. 1 0
      .gitlab/os-windows.yml
  4. 2 0
      .gitlab/rules.yml

+ 4 - 0
.gitlab/artifacts.yml

@@ -71,6 +71,8 @@
 .cmake_release_artifacts:
 .cmake_release_artifacts:
     artifacts:
     artifacts:
         expire_in: 5d
         expire_in: 5d
+        # Release artifacts are of interest even for failed jobs.
+        when: always
         paths:
         paths:
             # Any packages made.
             # Any packages made.
             - build/cmake-*-linux-x86_64.*
             - build/cmake-*-linux-x86_64.*
@@ -83,6 +85,8 @@
 .cmake_test_artifacts:
 .cmake_test_artifacts:
     artifacts:
     artifacts:
         expire_in: 1d
         expire_in: 1d
+        # External testing can be useful even if test jobs fail.
+        when: always
         paths:
         paths:
             # Take the install tree.
             # Take the install tree.
             - build/install/
             - build/install/

+ 2 - 0
.gitlab/os-macos.yml

@@ -70,6 +70,7 @@
     variables:
     variables:
         CMAKE_CONFIGURATION: macos_x86_64_xcode
         CMAKE_CONFIGURATION: macos_x86_64_xcode
         CMAKE_GENERATOR: Xcode
         CMAKE_GENERATOR: Xcode
+        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 
 .macos_arm64_xcode:
 .macos_arm64_xcode:
     extends: .macos
     extends: .macos
@@ -77,6 +78,7 @@
     variables:
     variables:
         CMAKE_CONFIGURATION: macos_arm64_xcode
         CMAKE_CONFIGURATION: macos_arm64_xcode
         CMAKE_GENERATOR: Xcode
         CMAKE_GENERATOR: Xcode
+        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 
 ## Tags
 ## Tags
 
 

+ 1 - 0
.gitlab/os-windows.yml

@@ -50,6 +50,7 @@
         CMAKE_GENERATOR: "Visual Studio 16 2019"
         CMAKE_GENERATOR: "Visual Studio 16 2019"
         CMAKE_GENERATOR_PLATFORM: "x64"
         CMAKE_GENERATOR_PLATFORM: "x64"
         CMAKE_GENERATOR_TOOLSET: "v142,version=14.28"
         CMAKE_GENERATOR_TOOLSET: "v142,version=14.28"
+        CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 
 ## Tags
 ## Tags
 
 

+ 2 - 0
.gitlab/rules.yml

@@ -38,6 +38,8 @@
     rules:
     rules:
         - if: '$CMAKE_CI_PACKAGE == "true"'
         - if: '$CMAKE_CI_PACKAGE == "true"'
           when: never
           when: never
+        - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_NIGHTLY_IGNORE_DEPS == "true")'
+          when: always
         - if: '$CMAKE_CI_NIGHTLY == "true"'
         - if: '$CMAKE_CI_NIGHTLY == "true"'
           when: on_success
           when: on_success
         - if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
         - if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'