mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
Merge pull request #6227 from spalger/implement/kbnServerArgsGruntRun
support arbitrary config for kbnServer in grunt-run
This commit is contained in:
commit
d5732720cf
1 changed files with 37 additions and 20 deletions
|
@ -6,6 +6,26 @@ module.exports = function (grunt) {
|
|||
let binScript = /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
|
||||
let uiConfig = require(root('test/serverConfig'));
|
||||
|
||||
const stdDevArgs = [
|
||||
'--env.name=development',
|
||||
'--logging.json=false',
|
||||
];
|
||||
|
||||
const buildTestsArgs = [
|
||||
...stdDevArgs,
|
||||
'--plugins.initialize=false',
|
||||
'--optimize.bundleFilter=tests',
|
||||
];
|
||||
|
||||
const kbnServerFlags = grunt.option.flags().reduce(function (flags, flag) {
|
||||
const matches = flag.match(/^--kbnServer(\.\w+)+=/);
|
||||
if (matches) {
|
||||
flags.push(flag.replace(/^--kbnServer\./, '--'));
|
||||
}
|
||||
|
||||
return flags;
|
||||
}, []);
|
||||
|
||||
return {
|
||||
testServer: {
|
||||
options: {
|
||||
|
@ -16,11 +36,9 @@ module.exports = function (grunt) {
|
|||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
...buildTestsArgs,
|
||||
'--server.port=5610',
|
||||
'--env.name=development',
|
||||
'--logging.json=false',
|
||||
'--optimize.bundleFilter=tests',
|
||||
'--plugins.initialize=false'
|
||||
...kbnServerFlags,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -33,11 +51,12 @@ module.exports = function (grunt) {
|
|||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
'--server.port=' + uiConfig.servers.kibana.port,
|
||||
'--server.xsrf.disableProtection=true',
|
||||
...stdDevArgs,
|
||||
'--optimize.enabled=false',
|
||||
'--elasticsearch.url=' + format(uiConfig.servers.elasticsearch),
|
||||
'--logging.json=false'
|
||||
'--server.port=' + uiConfig.servers.kibana.port,
|
||||
'--server.xsrf.disableProtection=true',
|
||||
...kbnServerFlags,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -50,10 +69,10 @@ module.exports = function (grunt) {
|
|||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
...stdDevArgs,
|
||||
'--server.port=' + uiConfig.servers.kibana.port,
|
||||
'--env.name=development',
|
||||
'--elasticsearch.url=' + format(uiConfig.servers.elasticsearch),
|
||||
'--logging.json=false'
|
||||
...kbnServerFlags,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -66,12 +85,10 @@ module.exports = function (grunt) {
|
|||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
...buildTestsArgs,
|
||||
'--server.port=5610',
|
||||
'--env.name=development',
|
||||
'--logging.json=false',
|
||||
'--optimize.bundleFilter=tests',
|
||||
'--plugins.initialize=false',
|
||||
'--testsBundle.instrument=true'
|
||||
'--testsBundle.instrument=true',
|
||||
...kbnServerFlags,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -84,6 +101,7 @@ module.exports = function (grunt) {
|
|||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
...buildTestsArgs,
|
||||
'--dev',
|
||||
'--no-watch',
|
||||
'--no-ssl',
|
||||
|
@ -91,9 +109,7 @@ module.exports = function (grunt) {
|
|||
'--server.port=5610',
|
||||
'--optimize.lazyPort=5611',
|
||||
'--optimize.lazyPrebuild=true',
|
||||
'--logging.json=false',
|
||||
'--optimize.bundleFilter=tests',
|
||||
'--plugins.initialize=false'
|
||||
...kbnServerFlags,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -109,7 +125,7 @@ module.exports = function (grunt) {
|
|||
'-jar',
|
||||
'selenium/selenium-server-standalone-2.48.2.jar',
|
||||
'-port',
|
||||
uiConfig.servers.webdriver.port
|
||||
uiConfig.servers.webdriver.port,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -125,7 +141,7 @@ module.exports = function (grunt) {
|
|||
'-jar',
|
||||
'selenium/selenium-server-standalone-2.48.2.jar',
|
||||
'-port',
|
||||
uiConfig.servers.webdriver.port
|
||||
uiConfig.servers.webdriver.port,
|
||||
]
|
||||
},
|
||||
|
||||
|
@ -140,7 +156,8 @@ module.exports = function (grunt) {
|
|||
'--env.name=production',
|
||||
'--logging.json=false',
|
||||
'--plugins.initialize=false',
|
||||
'--server.autoListen=false'
|
||||
'--server.autoListen=false',
|
||||
...kbnServerFlags,
|
||||
]
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue