From bea01531b984522940562866e904c83e8f9aed50 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Thu, 23 Aug 2018 17:00:13 +0900
Subject: .gitlab-ci.yml: Avoid running tests in post-merge

---
 .gitlab-ci.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

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:
-- 
cgit v1.2.1


From da19bcf1de75bf930d0f233addc858b4073d0173 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Thu, 23 Aug 2018 17:52:44 +0900
Subject: README.rst: Removing the badges

Now that we only run pre-merge CI, it makes no sense to show a badge for
the coverage and pipeline status of the last run of master.

It would make sense to show a badge for the last pipeline which
was run for the last merge request that was merged to master, but
I don't see any feature to get that information.
---
 README.rst | 5 -----
 1 file changed, 5 deletions(-)

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?
-- 
cgit v1.2.1