From ee5ca0ec3de7132ce2ab29df13d1049b84a18e92 Mon Sep 17 00:00:00 2001
From: David Rautureau <david.rautureau@sonarsource.com>
Date: Thu, 20 Sep 2018 21:04:34 +0200
Subject: [PATCH] Fix ITs

---
 .cirrus.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c05638ccb1c..29353ee69ef 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -33,6 +33,7 @@ env:
 
 build_task:
   only_if: $CIRRUS_BRANCH !=~ "dogfood/*" && $CIRRUS_BRANCH != "public_master"
+  auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' && $CIRRUS_BRANCH != 'dogfood-on-next'
   gke_container:
     image: gradle:4.10.1-jdk8
     cluster_name: cirrus-cluster
@@ -50,6 +51,7 @@ build_task:
 deploy_docs_task:
   depends_on: build
   only_if: $CIRRUS_BRANCH == 'dogfood-on-next'
+  auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' && $CIRRUS_BRANCH != 'dogfood-on-next'
   gke_container:
     image: gcr.io/ci-cd-215716/sonar-enterprise-bash:0.0.1
     cluster_name: cirrus-cluster
@@ -63,12 +65,13 @@ deploy_docs_task:
 validate_task:
   depends_on: build
   only_if: $CIRRUS_BRANCH !=~ "dogfood/*" && $CIRRUS_BRANCH != "public_master"
+  auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' && $CIRRUS_BRANCH != 'dogfood-on-next'
   gke_container:
     image: gcr.io/ci-cd-215716/sonar-enterprise-build:0.0.2
     cluster_name: cirrus-cluster
     zone: us-central1-a
     namespace: default
-    cpu: 3
+    cpu: 2
     memory: 10Gb
     additional_containers:
       - name: postgres
@@ -89,6 +92,7 @@ validate_task:
 qa_task:
   depends_on: build
   only_if: $CIRRUS_BRANCH !=~ "dogfood/*" && $CIRRUS_BRANCH != "public_master"
+  auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' && $CIRRUS_BRANCH != 'dogfood-on-next'
   gke_container:
     image: gcr.io/ci-cd-215716/sonar-enterprise-qa:0.0.1
     cluster_name: cirrus-cluster
@@ -116,6 +120,9 @@ qa_task:
       QA_CATEGORY: Developer
       QA_CATEGORY: Plugins
       QA_CATEGORY: Upgrade
+      QA_CATEGORY: Governance
+      QA_CATEGORY: Billing
+      #QA_CATEGORY: Branch
   gradle_cache:
     folder: ~/.gradle/caches
   script:
@@ -129,6 +136,7 @@ promote_task:
     - validate
     - qa
   only_if: $CIRRUS_BRANCH !=~ "dogfood/*" && $CIRRUS_BRANCH != "public_master"
+  auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' && $CIRRUS_BRANCH != 'dogfood-on-next'
   gke_container:
     image: gcr.io/ci-cd-215716/sonar-enterprise-bash:0.0.1
     cluster_name: cirrus-cluster
-- 
2.39.5