From c38427f67f17fa37fd49fd28e8af08e6963e13a4 Mon Sep 17 00:00:00 2001
From: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
Date: Wed, 3 Apr 2019 11:37:58 +0200
Subject: [PATCH] run ciGroup12 x60 times

---
 .ci/jobs.yml                                  | 97 +++++++++++++++----
 .../lib/mocha/setup_mocha.js                  |  6 +-
 test/scripts/jenkins_ci_group.sh              |  2 +-
 3 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/.ci/jobs.yml b/.ci/jobs.yml
index 596f22215a2a..bd7cfa64f2c7 100644
--- a/.ci/jobs.yml
+++ b/.ci/jobs.yml
@@ -1,26 +1,85 @@
 JOB:
   - kibana-intake
   - x-pack-intake
-  - kibana-ciGroup1
-  - kibana-ciGroup2
-  - kibana-ciGroup3
-  - kibana-ciGroup4
-  - kibana-ciGroup5
-  - kibana-ciGroup6
-  - kibana-ciGroup7
-  - kibana-ciGroup8
-  - kibana-ciGroup9
-  - kibana-ciGroup10
-  - kibana-ciGroup11
-  - kibana-ciGroup12
+  # - kibana-ciGroup1
+  # - kibana-ciGroup2
+  # - kibana-ciGroup3
+  # - kibana-ciGroup4
+  # - kibana-ciGroup5
+  # - kibana-ciGroup6
+  # - kibana-ciGroup7
+  # - kibana-ciGroup8
+  # - kibana-ciGroup9
+  # - kibana-ciGroup10
+  # - kibana-ciGroup11
+  - kibana-ciGroup12-1
+  - kibana-ciGroup12-2
+  - kibana-ciGroup12-3
+  - kibana-ciGroup12-4
+  - kibana-ciGroup12-5
+  - kibana-ciGroup12-6
+  - kibana-ciGroup12-7
+  - kibana-ciGroup12-8
+  - kibana-ciGroup12-9
+  - kibana-ciGroup12-10
+  - kibana-ciGroup12-11
+  - kibana-ciGroup12-12
+  - kibana-ciGroup12-13
+  - kibana-ciGroup12-14
+  - kibana-ciGroup12-15
+  - kibana-ciGroup12-16
+  - kibana-ciGroup12-17
+  - kibana-ciGroup12-18
+  - kibana-ciGroup12-19
+  - kibana-ciGroup12-20
+  - kibana-ciGroup12-21
+  - kibana-ciGroup12-22
+  - kibana-ciGroup12-23
+  - kibana-ciGroup12-24
+  - kibana-ciGroup12-25
+  - kibana-ciGroup12-26
+  - kibana-ciGroup12-27
+  - kibana-ciGroup12-28
+  - kibana-ciGroup12-29
+  - kibana-ciGroup12-30
+  - kibana-ciGroup12-31
+  - kibana-ciGroup12-32
+  - kibana-ciGroup12-33
+  - kibana-ciGroup12-34
+  - kibana-ciGroup12-35
+  - kibana-ciGroup12-36
+  - kibana-ciGroup12-37
+  - kibana-ciGroup12-38
+  - kibana-ciGroup12-39
+  - kibana-ciGroup12-40
+  - kibana-ciGroup12-41
+  - kibana-ciGroup12-42
+  - kibana-ciGroup12-43
+  - kibana-ciGroup12-44
+  - kibana-ciGroup12-45
+  - kibana-ciGroup12-46
+  - kibana-ciGroup12-47
+  - kibana-ciGroup12-48
+  - kibana-ciGroup12-49
+  - kibana-ciGroup12-50
+  - kibana-ciGroup12-51
+  - kibana-ciGroup12-52
+  - kibana-ciGroup12-53
+  - kibana-ciGroup12-54
+  - kibana-ciGroup12-55
+  - kibana-ciGroup12-56
+  - kibana-ciGroup12-57
+  - kibana-ciGroup12-58
+  - kibana-ciGroup12-59
+  - kibana-ciGroup12-60
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
-  - x-pack-ciGroup1
-  - x-pack-ciGroup2
-  - x-pack-ciGroup3
-  - x-pack-ciGroup4
-  - x-pack-ciGroup5
-  - x-pack-ciGroup6
-  - x-pack-ciGroup7
+  # - x-pack-ciGroup1
+  # - x-pack-ciGroup2
+  # - x-pack-ciGroup3
+  # - x-pack-ciGroup4
+  # - x-pack-ciGroup5
+  # - x-pack-ciGroup6
+  # - x-pack-ciGroup7
 
 # `~` is yaml for `null`
 exclude: ~
diff --git a/src/functional_test_runner/lib/mocha/setup_mocha.js b/src/functional_test_runner/lib/mocha/setup_mocha.js
index a7a302f222a5..cf3a1b0396a3 100644
--- a/src/functional_test_runner/lib/mocha/setup_mocha.js
+++ b/src/functional_test_runner/lib/mocha/setup_mocha.js
@@ -60,8 +60,10 @@ export async function setupMocha(lifecycle, log, config, providers) {
   filterSuitesByTags({
     log,
     mocha,
-    include: config.get('suiteTags.include'),
-    exclude: config.get('suiteTags.exclude'),
+    include: config.get('suiteTags.include')
+      .map(tag => tag.replace(/-\d+$/, '')),
+    exclude: config.get('suiteTags.exclude')
+      .map(tag => tag.replace(/-\d+$/, ''))
   });
 
   return mocha;
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index a4bc597316dc..6569c746c697 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -13,7 +13,7 @@ function report {
 
 trap report EXIT
 
-"$(FORCE_COLOR=0 yarn bin)/grunt" functionalTests:ensureAllTestsInCiGroup;
+#"$(FORCE_COLOR=0 yarn bin)/grunt" functionalTests:ensureAllTestsInCiGroup;
 
 node scripts/build --debug --oss;