diff --git a/tasks/config/run.js b/tasks/config/run.js index 5e0566d41dbf..7bb5b15e817b 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -6,6 +6,8 @@ module.exports = function (grunt) { const root = p => resolve(__dirname, '../../', p); const binScript = /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana'; const buildScript = /^win/.test(platform) ? '.\\build\\kibana\\bin\\kibana.bat' : './build/kibana/bin/kibana'; + const pkgVersion = grunt.config.get('pkg.version'); + const releaseBinScript = `./build/kibana-${pkgVersion}-linux-x86_64/bin/kibana`; const uiConfig = require(root('test/server_config')); const stdDevArgs = [ @@ -77,6 +79,22 @@ module.exports = function (grunt) { ] }, + testUIReleaseServer: { + options: { + wait: false, + ready: /Server running/, + quiet: false, + failOnError: false + }, + cmd: releaseBinScript, + args: [ + ...stdDevArgs, + '--server.port=' + uiConfig.servers.kibana.port, + '--elasticsearch.url=' + format(uiConfig.servers.elasticsearch), + ...kbnServerFlags, + ] + }, + testUIDevServer: { options: { wait: false, diff --git a/tasks/jenkins.js b/tasks/jenkins.js index 9ca8062a758f..f264e613cb81 100644 --- a/tasks/jenkins.js +++ b/tasks/jenkins.js @@ -38,7 +38,7 @@ module.exports = function (grunt) { 'jenkins:env', 'rejectRejFiles', - 'test:ui' + 'test:uiRelease' ]); }; diff --git a/tasks/test.js b/tasks/test.js index 1378aef78685..f53504259140 100644 --- a/tasks/test.js +++ b/tasks/test.js @@ -64,6 +64,16 @@ module.exports = function (grunt) { 'stop:testUIServer' ]); + grunt.registerTask('test:uiRelease', [ + 'checkPlugins', + 'esvm:ui', + 'run:testUIReleaseServer', + 'clean:screenshots', + 'functionalTestRunner', + 'esvm_shutdown:ui', + 'stop:testUIReleaseServer' + ]); + grunt.registerTask('test:ui:server', [ 'checkPlugins', 'esvm:ui', diff --git a/test/scripts/jenkins_selenium.sh b/test/scripts/jenkins_selenium.sh index 58224b32909b..d035147563a8 100755 --- a/test/scripts/jenkins_selenium.sh +++ b/test/scripts/jenkins_selenium.sh @@ -3,4 +3,6 @@ set -e source "$(dirname $0)/_jenkins_setup.sh" +"$(npm bin)/grunt" build --release; + xvfb-run "$(npm bin)/grunt" jenkins:selenium;