Skip to content

Commit

Permalink
Cut down on all tests except for secops tests and one example of infr… (
Browse files Browse the repository at this point in the history
#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
  • Loading branch information
FrankHassanabad committed Oct 26, 2018
1 parent a9a2832 commit 35ef51f
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 24 deletions.
3 changes: 2 additions & 1 deletion test/scripts/jenkins_selenium.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
3 changes: 2 additions & 1 deletion test/scripts/jenkins_unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
8 changes: 4 additions & 4 deletions test/scripts/jenkins_xpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down
23 changes: 12 additions & 11 deletions x-pack/scripts/functional_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
]);
24 changes: 17 additions & 7 deletions x-pack/test/api_integration/apis/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
}

0 comments on commit 35ef51f

Please sign in to comment.