oss tests: replace grunt task with node script (#82371) (#82633)

# Conflicts:
#	tasks/function_test_groups.js
#	test/scripts/jenkins_ci_group.sh
This commit is contained in:
Dmitry 2020-11-05 13:17:33 +01:00 committed by GitHub
parent cbe92eb49a
commit 8e9876ef59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 40 deletions

View file

@ -17,8 +17,6 @@
* under the License.
*/
import { getFunctionalTestGroupRunConfigs } from '../function_test_groups';
const { version } = require('../../package.json');
const KIBANA_INSTALL_DIR =
process.env.KIBANA_INSTALL_DIR ||
@ -238,9 +236,5 @@ module.exports = function () {
'test:jest_integration'
),
test_projects: gruntTaskWithGithubChecks('Project tests', 'test:projects'),
...getFunctionalTestGroupRunConfigs({
kibanaInstallDir: KIBANA_INSTALL_DIR,
}),
};
};

View file

@ -29,39 +29,6 @@ const TEST_TAGS = safeLoad(JOBS_YAML)
.JOB.filter((id) => id.startsWith('kibana-ciGroup'))
.map((id) => id.replace(/^kibana-/, ''));
export function getFunctionalTestGroupRunConfigs({ kibanaInstallDir } = {}) {
return {
// include a run task for each test group
...TEST_TAGS.reduce(
(acc, tag) => ({
...acc,
[`functionalTests_${tag}`]: {
cmd: process.execPath,
args: [
'scripts/functional_tests',
'--include-tag',
tag,
'--config',
'test/functional/config.js',
'--config',
'test/ui_capabilities/newsfeed_err/config.ts',
'--config',
'test/new_visualize_flow/config.ts',
'--config',
'test/security_functional/config.ts',
// '--config', 'test/functional/config.firefox.js',
'--bail',
'--debug',
'--kibana-install-dir',
kibanaInstallDir,
],
},
}),
{}
),
};
}
grunt.registerTask(
'functionalTests:ensureAllTestsInCiGroup',
'Check that all of the functional tests are in a CI group',

View file

@ -2,7 +2,11 @@
source test/scripts/jenkins_test_setup_oss.sh
checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" \
node scripts/functional_tests \
--debug --bail \
--kibana-install-dir "$KIBANA_INSTALL_DIR" \
--include-tag "ciGroup$CI_GROUP"
if [[ ! "$TASK_QUEUE_PROCESS_ID" && "$CI_GROUP" == "1" ]]; then
source test/scripts/jenkins_build_kbn_sample_panel_action.sh