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

test/scripts/jenkins_selenium.sh

@@ -8,4 +8,5 @@ source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
 node scripts/build --release --debug --oss;
 
 export TEST_ES_FROM=${TEST_ES_FROM:-source}
-xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:selenium --from=source;
+# This should not be merged into master as we are only running tests for secops
+# xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:selenium --from=source;

test/scripts/jenkins_unit.sh

@@ -6,4 +6,5 @@ source "$(dirname $0)/../../src/dev/ci_setup/git_setup.sh"
 source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
 
 export TEST_ES_FROM=${TEST_ES_FROM:-source}
-xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --from=source;
+# This should not merge forward into master. This disables unit tests since we are only running them for secops
+# xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --from=source;

test/scripts/jenkins_xpack.sh

@@ -12,16 +12,16 @@ export XPACK_DIR="$(cd "$(dirname "$0")/../../x-pack"; pwd)"
 echo "-> XPACK_DIR ${XPACK_DIR}"
 
 
-echo " -> Running mocha tests"
+echo " -> Skipping Running mocha tests (for secops only)"
 cd "$XPACK_DIR"
-xvfb-run yarn test
+# xvfb-run 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 ""
 

x-pack/scripts/functional_tests.js

@@ -6,16 +6,17 @@
 
 require('@kbn/plugin-helpers').babelRegister();
 require('@kbn/test').runTestsCli([
-  require.resolve('../test/reporting/configs/chromium_api.js'),
-  require.resolve('../test/reporting/configs/chromium_functional.js'),
-  require.resolve('../test/reporting/configs/phantom_api.js'),
-  require.resolve('../test/reporting/configs/phantom_functional.js'),
-  require.resolve('../test/functional/config.js'),
+// These commented out tests are only for within the secops branch and should not be merged into master
+//  require.resolve('../test/reporting/configs/chromium_api.js'),
+//  require.resolve('../test/reporting/configs/chromium_functional.js'),
+//  require.resolve('../test/reporting/configs/phantom_api.js'),
+//  require.resolve('../test/reporting/configs/phantom_functional.js'),
+//  require.resolve('../test/functional/config.js'),
   require.resolve('../test/api_integration/config.js'),
-  require.resolve('../test/saml_api_integration/config.js'),
-  require.resolve('../test/spaces_api_integration/spaces_only/config'),
-  require.resolve('../test/spaces_api_integration/security_and_spaces/config'),
-  require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
-  require.resolve('../test/saved_object_api_integration/security_only/config'),
-  require.resolve('../test/saved_object_api_integration/spaces_only/config'),
+//  require.resolve('../test/saml_api_integration/config.js'),
+//  require.resolve('../test/spaces_api_integration/spaces_only/config'),
+//  require.resolve('../test/spaces_api_integration/security_and_spaces/config'),
+//  require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
+//  require.resolve('../test/saved_object_api_integration/security_only/config'),
+//  require.resolve('../test/saved_object_api_integration/spaces_only/config'),
 ]);

x-pack/test/api_integration/apis/index.js

@@ -6,13 +6,23 @@
 
 export default function ({ loadTestFile }) {
   describe('apis', () => {
-    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'));
+    // loadTestFile(require.resolve('./infra'));
+
+    // 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'));
   });
 }