Skip to content

Commit 35ef51f

Browse files
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
1 parent a9a2832 commit 35ef51f

File tree

5 files changed

+37
-24
lines changed

5 files changed

+37
-24
lines changed

test/scripts/jenkins_selenium.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
88
node scripts/build --release --debug --oss;
99

1010
export TEST_ES_FROM=${TEST_ES_FROM:-source}
11-
xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:selenium --from=source;
11+
# This should not be merged into master as we are only running tests for secops
12+
# xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:selenium --from=source;

test/scripts/jenkins_unit.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ source "$(dirname $0)/../../src/dev/ci_setup/git_setup.sh"
66
source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
77

88
export TEST_ES_FROM=${TEST_ES_FROM:-source}
9-
xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --from=source;
9+
# This should not merge forward into master. This disables unit tests since we are only running them for secops
10+
# xvfb-run "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --from=source;

test/scripts/jenkins_xpack.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ export XPACK_DIR="$(cd "$(dirname "$0")/../../x-pack"; pwd)"
1212
echo "-> XPACK_DIR ${XPACK_DIR}"
1313

1414

15-
echo " -> Running mocha tests"
15+
echo " -> Skipping Running mocha tests (for secops only)"
1616
cd "$XPACK_DIR"
17-
xvfb-run yarn test
17+
# xvfb-run yarn test
1818
echo ""
1919
echo ""
2020

2121

22-
echo " -> Running jest tests"
22+
echo " -> Running jest tests (for secops only)"
2323
cd "$XPACK_DIR"
24-
node scripts/jest --ci --no-cache --verbose
24+
node scripts/jest --ci --no-cache --verbose secops
2525
echo ""
2626
echo ""
2727

x-pack/scripts/functional_tests.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66

77
require('@kbn/plugin-helpers').babelRegister();
88
require('@kbn/test').runTestsCli([
9-
require.resolve('../test/reporting/configs/chromium_api.js'),
10-
require.resolve('../test/reporting/configs/chromium_functional.js'),
11-
require.resolve('../test/reporting/configs/phantom_api.js'),
12-
require.resolve('../test/reporting/configs/phantom_functional.js'),
13-
require.resolve('../test/functional/config.js'),
9+
// These commented out tests are only for within the secops branch and should not be merged into master
10+
// require.resolve('../test/reporting/configs/chromium_api.js'),
11+
// require.resolve('../test/reporting/configs/chromium_functional.js'),
12+
// require.resolve('../test/reporting/configs/phantom_api.js'),
13+
// require.resolve('../test/reporting/configs/phantom_functional.js'),
14+
// require.resolve('../test/functional/config.js'),
1415
require.resolve('../test/api_integration/config.js'),
15-
require.resolve('../test/saml_api_integration/config.js'),
16-
require.resolve('../test/spaces_api_integration/spaces_only/config'),
17-
require.resolve('../test/spaces_api_integration/security_and_spaces/config'),
18-
require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
19-
require.resolve('../test/saved_object_api_integration/security_only/config'),
20-
require.resolve('../test/saved_object_api_integration/spaces_only/config'),
16+
// require.resolve('../test/saml_api_integration/config.js'),
17+
// require.resolve('../test/spaces_api_integration/spaces_only/config'),
18+
// require.resolve('../test/spaces_api_integration/security_and_spaces/config'),
19+
// require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
20+
// require.resolve('../test/saved_object_api_integration/security_only/config'),
21+
// require.resolve('../test/saved_object_api_integration/spaces_only/config'),
2122
]);

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

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,23 @@
66

77
export default function ({ loadTestFile }) {
88
describe('apis', () => {
9-
loadTestFile(require.resolve('./es'));
10-
loadTestFile(require.resolve('./security'));
11-
loadTestFile(require.resolve('./monitoring'));
12-
loadTestFile(require.resolve('./xpack_main'));
13-
loadTestFile(require.resolve('./logstash'));
14-
loadTestFile(require.resolve('./kibana'));
9+
// These commented out tests are only for within the secops branch and should not be merged into master
10+
// loadTestFile(require.resolve('./es'));
11+
// loadTestFile(require.resolve('./security'));
12+
// loadTestFile(require.resolve('./monitoring'));
13+
// loadTestFile(require.resolve('./xpack_main'));
14+
// loadTestFile(require.resolve('./logstash'));
15+
// loadTestFile(require.resolve('./kibana'));
16+
// loadTestFile(require.resolve('./infra'));
17+
18+
// TODO: I am only running infra at the moment
19+
// but in reality I should not be running infra and
20+
// should instead be running secops which still needs
21+
// to be built. I kept this api integration test running for right now
22+
// as an example. -- Frank H.
23+
// See completion of issue: https://github.com/elastic/ingest-dev/issues/56
1524
loadTestFile(require.resolve('./infra'));
16-
loadTestFile(require.resolve('./beats'));
25+
26+
// loadTestFile(require.resolve('./beats'));
1727
});
1828
}

0 commit comments

Comments
 (0)