Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
22 changes: 11 additions & 11 deletions x-pack/scripts/functional_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@

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'),
// require.resolve('../test/reporting/configs/chromium_api.js'),

This comment was marked as resolved.

// 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'),
]);
23 changes: 16 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,22 @@

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'));
// loadTestFile(require.resolve('./es'));

This comment was marked as resolved.

// 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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense, and this comment will go away soon

// 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'));
});
}