Cut down on all tests except for secops tests and one example of infr… (

#24693) * Cut down on all tests except for secops tests and one example of infra integration tests * Commented out code for only this branch * Added comments and "please see issue number" * https://github.com/elastic/ingest-dev/issues/60
elastic · Dec 4, 2018 · 8de4294 · 8de4294
1 parent e565f0b
commit 8de4294
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 30 deletions.
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
@@ -1,26 +1,26 @@
 JOB:
-  - kibana-intake
+  #- kibana-intake
   - x-pack-intake
   # make sure all kibana-ciGRoups are listed in tasks/function_test_groups.js
-  - 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
   # 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-ciGroup1
+  #- x-pack-ciGroup2
+  #- x-pack-ciGroup3
+  #- x-pack-ciGroup4
+  #- x-pack-ciGroup5
+  #- x-pack-ciGroup6
 
 # `~` is yaml for `null`
 exclude: ~
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
@@ -6,15 +6,15 @@ source src/dev/ci_setup/checkout_sibling_es.sh
 
 export TEST_BROWSER_HEADLESS=1
 
-echo " -> Running mocha tests"
+echo " -> Skipping Running mocha tests (for secops only)"
 cd "$XPACK_DIR"
-yarn test
+# yarn test
 echo ""
 echo ""
 
 
-echo " -> Running jest tests"
+echo " -> Running jest tests (for secops only)"
 cd "$XPACK_DIR"
-node scripts/jest --ci --no-cache --verbose
+node scripts/jest --ci --no-cache --verbose secops
 echo ""
 echo ""
diff --git a/x-pack/test/api_integration/apis/index.js b/x-pack/test/api_integration/apis/index.js
@@ -1,3 +1,4 @@
+
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License;
@@ -8,13 +9,22 @@ export default function ({ loadTestFile }) {
   describe('apis', function () {
     this.tags('ciGroup5');
 
-    loadTestFile(require.resolve('./es'));
-    loadTestFile(require.resolve('./security'));
-    loadTestFile(require.resolve('./monitoring'));
-    loadTestFile(require.resolve('./xpack_main'));
-    loadTestFile(require.resolve('./logstash'));
-    loadTestFile(require.resolve('./kibana'));
+    // These commented out tests are only for within the secops branch and should not be merged into master
+    // loadTestFile(require.resolve('./es'));
+    // loadTestFile(require.resolve('./security'));
+    // loadTestFile(require.resolve('./monitoring'));
+    // loadTestFile(require.resolve('./xpack_main'));
+    // loadTestFile(require.resolve('./logstash'));
+    // loadTestFile(require.resolve('./kibana'));
+
+    // TODO: I am only running infra at the moment
+    // but in reality I should not be running infra and
+    // should instead be running secops which still needs
+    // to be built. I kept this api integration test running for right now
+    // as an example. -- Frank H.
+    // See completion of issue: https://github.com/elastic/ingest-dev/issues/56
     loadTestFile(require.resolve('./infra'));
-    loadTestFile(require.resolve('./beats'));
+
+    // loadTestFile(require.resolve('./beats'));
   });
 }