diff options
| author | Michael Biebl <biebl@debian.org> | 2025-01-20 19:08:06 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2025-01-20 19:08:06 +0100 |
| commit | 818258cf34b83fbc754633295e1052d4752d7b15 (patch) | |
| tree | aa45b6a831d6c0ee954b1a03891ad3da09349528 /.gitlab-ci/ci.template | |
| parent | e465722b908aa870bdc293b9a417d3c15294aa6d (diff) | |
New upstream version 1.50.2 upstream/1.50.2
Diffstat (limited to '.gitlab-ci/ci.template')
| -rw-r--r-- | .gitlab-ci/ci.template | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 208c3490..a804a2ee 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -16,7 +16,7 @@ # see https://docs.gitlab.com/ee/ci/yaml/#includefile -.templates_sha: &template_sha 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6 +.templates_sha: &template_sha 593a0a5fe35a523a646a7efae5471c9759b8fba3 {# Group distros by their common (name,) tuples.#} {% set distro_groups = [] %} @@ -88,6 +88,7 @@ variables: - NetworkManager-1*.tar.xz - NetworkManager-1*.src.rpm - nm-test.log + - testlog.txt .nm_artifacts_debug: artifacts: @@ -95,6 +96,7 @@ variables: when: always paths: - nm-test.log + - testlog.txt ################################################################# # # @@ -210,6 +212,10 @@ check-tree: needs: - "tier{{default_distro.tier}}:{{default_distro.name}}:{{default_distro.versions[0]}}@prep" rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH + allow_failure: true + - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH + allow_failure: true - if: $CI_PIPELINE_SOURCE != 'schedule' stage: tier1 script: |