run ciGroup 7 & 8 15x times

elastic · Oct 17, 2019 · 8be64d5 · 8be64d5
1 parent 8f5caed
commit 8be64d5
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 51 deletions.
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
@@ -1,33 +1,61 @@
 JOB:
-  - kibana-intake
-  - x-pack-intake
-  - kibana-firefoxSmoke
-  - 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-intake
+  # - x-pack-intake
+  # - kibana-firefoxSmoke
+  # - kibana-ciGroup1
+  # - kibana-ciGroup2
+  # - kibana-ciGroup3
+  # - kibana-ciGroup4
+  # - kibana-ciGroup5
+  # - kibana-ciGroup6
+  - kibana-ciGroup7-1
+  - kibana-ciGroup7-2
+  - kibana-ciGroup7-3
+  - kibana-ciGroup7-4
+  - kibana-ciGroup7-5
+  - kibana-ciGroup7-6
+  - kibana-ciGroup7-7
+  - kibana-ciGroup7-8
+  - kibana-ciGroup7-9
+  - kibana-ciGroup7-10
+  - kibana-ciGroup7-11
+  - kibana-ciGroup7-12
+  - kibana-ciGroup7-13
+  - kibana-ciGroup7-14
+  - kibana-ciGroup7-15
+  - kibana-ciGroup8-1
+  - kibana-ciGroup8-2
+  - kibana-ciGroup8-3
+  - kibana-ciGroup8-4
+  - kibana-ciGroup8-5
+  - kibana-ciGroup8-6
+  - kibana-ciGroup8-7
+  - kibana-ciGroup8-8
+  - kibana-ciGroup8-9
+  - kibana-ciGroup8-10
+  - kibana-ciGroup8-11
+  - kibana-ciGroup8-12
+  - kibana-ciGroup8-13
+  - kibana-ciGroup8-14
+  - kibana-ciGroup8-15
+  # - kibana-ciGroup9
+  # - kibana-ciGroup10
+  # - kibana-ciGroup11
+  # - kibana-ciGroup12
   # - kibana-visualRegression
 
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
-  - x-pack-firefoxSmoke
-  - x-pack-ciGroup1
-  - x-pack-ciGroup2
-  - x-pack-ciGroup3
-  - x-pack-ciGroup4
-  - x-pack-ciGroup5
-  - x-pack-ciGroup6
-  - x-pack-ciGroup7
-  - x-pack-ciGroup8
-  - x-pack-ciGroup9
-  - x-pack-ciGroup10
+  # - x-pack-firefoxSmoke
+  # - x-pack-ciGroup1
+  # - x-pack-ciGroup2
+  # - x-pack-ciGroup3
+  # - x-pack-ciGroup4
+  # - x-pack-ciGroup5
+  # - x-pack-ciGroup6
+  # - x-pack-ciGroup7
+  # - x-pack-ciGroup8
+  # - x-pack-ciGroup9
+  # - x-pack-ciGroup10
   # - x-pack-visualRegression
 
 # `~` is yaml for `null`

diff --git a/test/scripts/jenkins_build_kibana.sh b/test/scripts/jenkins_build_kibana.sh
@@ -6,7 +6,7 @@ echo " -> downloading es snapshot"
 node scripts/es snapshot --license=oss --download-only;
 
 echo " -> Ensuring all functional tests are in a ciGroup"
-yarn run grunt functionalTests:ensureAllTestsInCiGroup;
+#yarn run grunt functionalTests:ensureAllTestsInCiGroup;
 
 echo " -> building and extracting OSS Kibana distributable for use in functional tests"
 node scripts/build --debug --oss
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
@@ -11,7 +11,7 @@ fi
 export TEST_BROWSER_HEADLESS=1
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  yarn run grunt functionalTests:ensureAllTestsInCiGroup;
+  #yarn run grunt functionalTests:ensureAllTestsInCiGroup;
   node scripts/build --debug --oss;
 else
   installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"

diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh
@@ -7,18 +7,18 @@ echo " -> downloading es snapshot"
 node scripts/es snapshot --download-only;
 
 echo " -> Ensuring all functional tests are in a ciGroup"
-cd "$XPACK_DIR"
-node scripts/functional_tests --assert-none-excluded \
-  --include-tag ciGroup1 \
-  --include-tag ciGroup2 \
-  --include-tag ciGroup3 \
-  --include-tag ciGroup4 \
-  --include-tag ciGroup5 \
-  --include-tag ciGroup6 \
-  --include-tag ciGroup7 \
-  --include-tag ciGroup8 \
-  --include-tag ciGroup9 \
-  --include-tag ciGroup10
+# cd "$XPACK_DIR"
+# node scripts/functional_tests --assert-none-excluded \
+#   --include-tag ciGroup1 \
+#   --include-tag ciGroup2 \
+#   --include-tag ciGroup3 \
+#   --include-tag ciGroup4 \
+#   --include-tag ciGroup5 \
+#   --include-tag ciGroup6 \
+#   --include-tag ciGroup7 \
+#   --include-tag ciGroup8 \
+#   --include-tag ciGroup9 \
+#   --include-tag ciGroup10
 
 echo " -> building and extracting default Kibana distributable for use in functional tests"
 cd "$KIBANA_DIR"

diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
@@ -13,17 +13,17 @@ export TEST_BROWSER_HEADLESS=1
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   echo " -> Ensuring all functional tests are in a ciGroup"
   cd "$XPACK_DIR"
-  node scripts/functional_tests --assert-none-excluded \
-    --include-tag ciGroup1 \
-    --include-tag ciGroup2 \
-    --include-tag ciGroup3 \
-    --include-tag ciGroup4 \
-    --include-tag ciGroup5 \
-    --include-tag ciGroup6 \
-    --include-tag ciGroup7 \
-    --include-tag ciGroup8 \
-    --include-tag ciGroup9 \
-    --include-tag ciGroup10
+  # node scripts/functional_tests --assert-none-excluded \
+  #   --include-tag ciGroup1 \
+  #   --include-tag ciGroup2 \
+  #   --include-tag ciGroup3 \
+  #   --include-tag ciGroup4 \
+  #   --include-tag ciGroup5 \
+  #   --include-tag ciGroup6 \
+  #   --include-tag ciGroup7 \
+  #   --include-tag ciGroup8 \
+  #   --include-tag ciGroup9 \
+  #   --include-tag ciGroup10
 fi
 
 cd "$KIBANA_DIR"