Merge pull request #6114 from jbudz/snapshots

[build] Set os-packages flag on jenkins
This commit is contained in:
Jonathan Budzenski 2016-02-04 15:03:52 -06:00
commit ad2f9b4ba6
2 changed files with 9 additions and 6 deletions

View file

@ -1,7 +1,7 @@
module.exports = function (grunt) {
let { flatten } = require('lodash');
grunt.registerTask('build', 'Build packages', function (arg) {
grunt.registerTask('build', 'Build packages', function () {
grunt.task.run(flatten([
'_build:getProps',
'clean:build',
@ -23,7 +23,7 @@ module.exports = function (grunt) {
'_build:downloadNodeBuilds:finish',
'_build:versionedLinks',
'_build:archives',
(grunt.option('os-packages') || arg === 'ospackages') ? [
grunt.option('os-packages') ? [
'_build:pleaseRun',
'_build:osPackages',
] : [],

View file

@ -1,9 +1,12 @@
module.exports = function (grunt) {
let { compact } = require('lodash');
grunt.registerTask('jenkins', 'Jenkins build script', compact([
'test',
process.env.JOB_NAME === 'kibana_core' ? 'build:ospackages' : null
]));
grunt.registerTask('jenkins', 'Jenkins build script', function () {
grunt.option('os-packages', true);
grunt.task.run(compact([
'test',
process.env.JOB_NAME === 'kibana_core' ? 'build' : null
]));
});
};