diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-08-27 15:51:20 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-08-27 15:51:20 +0900 |
| commit | 7c6e91f5ce01085a70fe793818e100a1a78f5fd9 (patch) | |
| tree | 633c00c4eb6b4cdac295516ab9c3426b3d98d59d | |
| parent | 4b6f3d0d1bfd3b856869bb6e037e5025ac598537 (diff) | |
| download | buildstream-7c6e91f5ce01085a70fe793818e100a1a78f5fd9.tar.gz | |
Revert ".gitlab-ci.yml: Avoid running tests in post-merge"
This reverts commit bea01531b984522940562866e904c83e8f9aed50.
| -rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 669f87dbf..8d268e3c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,16 +10,6 @@ stages: - test - post -# Avoid running all the tests post merge on -# master or on any release branch. -# -.tests-condition-template: &tests-condition - only: - - branches - except: - - master - - /bst-1\..*/ - ##################################################### # Prepare stage # ##################################################### @@ -96,26 +86,20 @@ source_dist: tests-debian-9: image: buildstream/testsuite-debian:9-master-114-4cab18e3 <<: *linux-tests - <<: *tests-condition tests-fedora-27: image: buildstream/testsuite-fedora:27-master-114-4cab18e3 <<: *linux-tests - <<: *tests-condition tests-fedora-28: image: buildstream/testsuite-fedora:28-master-114-4cab18e3 <<: *linux-tests - <<: *tests-condition tests-ubuntu-18.04: image: buildstream/testsuite-ubuntu:18.04-master-114-4cab18e3 <<: *linux-tests - <<: *tests-condition tests-unix: - <<: *tests-condition - # Use fedora here, to a) run a test on fedora and b) ensure that we # can get rid of ostree - this is not possible with debian-8 image: buildstream/testsuite-fedora:27-master-114-4cab18e3 @@ -154,15 +138,6 @@ tests-unix: # Note: We still do not enforce a consistent installation of python3-sphinx, # as it will significantly grow the backing image. docs: - - # Here we build the docs for every pre-merge CI, but avoid - # the job on post-merge to stable branches, because we only - # ever publish them from master - only: - - branches - except: - - /bst-1\..*/ - stage: test script: - export BST_SOURCE_CACHE="$(pwd)/cache/integration-cache/sources" @@ -185,8 +160,6 @@ docs: # Check code quality with gitlab's built-in feature. # code_quality: - <<: *tests-condition - image: docker:stable stage: post variables: @@ -205,8 +178,6 @@ code_quality: paths: [gl-code-quality-report.json] analysis: - <<: *tests-condition - stage: post script: - | @@ -235,8 +206,6 @@ analysis: # Collate coverage reports # coverage: - <<: *tests-condition - stage: post coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/' script: |