mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
# Conflicts: # tasks/function_test_groups.js # test/scripts/jenkins_ci_group.sh
This commit is contained in:
parent
cbe92eb49a
commit
8e9876ef59
3 changed files with 5 additions and 40 deletions
|
@ -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,
|
||||
}),
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue