summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2018-08-23 10:13:23 +0000
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2018-08-23 10:13:23 +0000
commit8216ff8dac91692c9358c3e535f5a0a2c26c1332 (patch)
tree3edb498b3b1ab1e5a8fb144bd4806864c3f2d890
parentf1e3f10ffe2aeb7627009644c9cb93505686fddc (diff)
parentda19bcf1de75bf930d0f233addc858b4073d0173 (diff)
downloadbuildstream-jjardon/ci-test.tar.gz
Merge branch 'tristan/reduce-gitlab-ci' into 'master'jjardon/ci-test
.gitlab-ci.yml: Avoid running tests in post-merge See merge request BuildStream/buildstream!709
-rw-r--r--.gitlab-ci.yml31
-rw-r--r--README.rst5
2 files changed, 31 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f68571d9c..a5aa0bc45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,16 @@ 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 #
#####################################################
@@ -81,20 +91,26 @@ 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
@@ -133,6 +149,15 @@ 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"
@@ -157,6 +182,8 @@ docs:
# as an output of radon, with some conversion
#
codequality:
+ <<: *tests-condition
+
image: docker:stable
stage: post
variables:
@@ -175,6 +202,8 @@ codequality:
paths: [codeclimate.json]
analysis:
+ <<: *tests-condition
+
stage: post
script:
- |
@@ -203,6 +232,8 @@ analysis:
# Collate coverage reports
#
coverage:
+ <<: *tests-condition
+
stage: post
coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/'
script:
diff --git a/README.rst b/README.rst
index c553da068..6bbe6f4c1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,5 @@
About
-----
-.. image:: https://gitlab.com/BuildStream/buildstream/badges/master/pipeline.svg
- :target: https://gitlab.com/BuildStream/buildstream/commits/master
-
-.. image:: https://gitlab.com/BuildStream/buildstream/badges/master/coverage.svg?job=coverage
- :target: https://gitlab.com/BuildStream/buildstream/commits/master
What is BuildStream?