Tweak CI rules for optional tests

so they are not needed for merge requests
This commit is contained in:
Torsten Grote
2021-04-19 10:50:42 -03:00
parent 67bd065bc3
commit f7a957150e

View File

@@ -25,6 +25,10 @@ test:
script: script:
- ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
- ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom check - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom check
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: always
- when: always
android test: android test:
extends: .base-test extends: .base-test
@@ -48,10 +52,15 @@ android test:
when: on_failure when: on_failure
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_PIPELINE_SOURCE == "schedule"'
- changes: when: on_success
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes:
- briar-android/**/* - briar-android/**/*
when: manual when: manual
allow_failure: true allow_failure: true
- if: '$CI_COMMIT_TAG == null'
when: manual
allow_failure: true
retry: retry:
max: 1 max: 1
tags: tags:
@@ -88,6 +97,7 @@ bridge test:
extends: .optional_tests extends: .optional_tests
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_PIPELINE_SOURCE == "schedule"'
when: on_success
allow_failure: true allow_failure: true
- if: '$CI_COMMIT_TAG == null' - if: '$CI_COMMIT_TAG == null'
when: manual when: manual