Revert "Execute xpack ciGroup3 20x"

This reverts commit ef4d106.
elastic · Nov 12, 2019 · 423e80f · 423e80f
1 parent ef4d106
commit 423e80f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 73 deletions.
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
@@ -1,55 +1,36 @@
 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-accessibility
-  #- kibana-visualRegression
+  - 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-accessibility
+  - 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-1
-  - x-pack-ciGroup3-2
-  - x-pack-ciGroup3-3
-  - x-pack-ciGroup3-4
-  - x-pack-ciGroup3-5
-  - x-pack-ciGroup3-6
-  - x-pack-ciGroup3-7
-  - x-pack-ciGroup3-8
-  - x-pack-ciGroup3-9
-  - x-pack-ciGroup3-10
-  - x-pack-ciGroup3-11
-  - x-pack-ciGroup3-12
-  - x-pack-ciGroup3-13
-  - x-pack-ciGroup3-14
-  - x-pack-ciGroup3-15
-  - x-pack-ciGroup3-16
-  - x-pack-ciGroup3-17
-  - x-pack-ciGroup3-18
-  - x-pack-ciGroup3-19
-  - x-pack-ciGroup3-20
-  #- x-pack-ciGroup4
-  #- x-pack-ciGroup5
-  #- x-pack-ciGroup6
-  #- x-pack-ciGroup7
-  #- x-pack-ciGroup8
-  #- x-pack-ciGroup9
-  #- x-pack-ciGroup10
-  #- x-pack-accessibility
-  #- x-pack-visualRegression
+  - 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-accessibility
+  - x-pack-visualRegression
 
 # `~` is yaml for `null`
 exclude: ~
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
@@ -3,7 +3,7 @@
 source test/scripts/jenkins_test_setup.sh
 
 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
@@ -8,17 +8,17 @@ 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
+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
@@ -5,17 +5,17 @@ source test/scripts/jenkins_test_setup.sh
 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"