github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ui] default to k7Design in releases (#25487)

Browse source 
* [ui] default to k7Design in releases

* [ci] don't build in release mode for testing

* [ci] run SNAPSHOT build
This commit is contained in:
Spencer 2018-11-09 18:01:48 -08:00 • committed by GitHub
parent 50eb9e6ef4
commit 223e3dc6ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core_plugins/kibana/ui_setting_defaults.js
View file

@ -19,6 +19,7 @@
import moment from 'moment-timezone';
import numeralLanguages from '@elastic/numeral/languages';
import { IS_KIBANA_RELEASE } from '../../utils';
export function getUiSettingDefaults() {
const weekdays = moment.weekdays().slice();
@ -46,7 +47,7 @@ export function getUiSettingDefaults() {
},
'k7design': {
name: 'Use the new K7 UI design',
value: false,
value: IS_KIBANA_RELEASE,
description: `When set, Kibana will use the new K7 design targeted for release in 7.0. At this time, not all features are
implemented.`,
},

4
src/dev/build/lib/config.js
View file

@ -46,6 +46,10 @@ export async function getConfig({ isRelease, targetAllPlatforms, versionQualifie
return pkg;
}
isRelease() {
return isRelease;
}
/**
* Get the node version required by Kibana
* @return {String}

1
src/dev/build/tasks/create_package_json_task.js
View file

@ -37,6 +37,7 @@ export const CreatePackageJsonTask = {
number: config.getBuildNumber(),
sha: config.getBuildSha(),
distributable: true,
release: config.isRelease(),
},
repository: pkg.repository,
engines: {

1
src/utils/artifact_type.ts
View file

@ -20,3 +20,4 @@
import { pkg } from './package_json';
export const IS_KIBANA_DISTRIBUTABLE = pkg.build && pkg.build.distributable === true;
export const IS_KIBANA_RELEASE = pkg.build && pkg.build.release === true;

1
src/utils/index.js
View file

@ -27,6 +27,7 @@ export { encodeQueryComponent } from './encode_query_component';
export { getFlattenedObject } from './get_flattened_object';
export { watchStdioForLine } from './watch_stdio_for_line';
export { IS_KIBANA_DISTRIBUTABLE } from './artifact_type';
export { IS_KIBANA_RELEASE } from './artifact_type';
export {
getKbnTypeNames,

9
tasks/config/run.js
View file

@ -19,7 +19,8 @@
import { resolve } from 'path';
const PKG_VERSION = require('../../package.json').version;
const { version } = require('../../package.json');
const KIBANA_INSTALL_DIR = `./build/oss/kibana-${version}-SNAPSHOT-${process.platform}-x86_64`;
module.exports = function (grunt) {
@ -188,7 +189,7 @@ module.exports = function (grunt) {
'--esFrom', esFrom,
'--bail',
'--debug',
'--kibana-install-dir', `./build/oss/kibana-${PKG_VERSION}-${process.platform}-x86_64`,
'--kibana-install-dir', KIBANA_INSTALL_DIR,
],
},
@ -200,7 +201,7 @@ module.exports = function (grunt) {
'--esFrom', esFrom,
'--bail',
'--debug',
'--kibana-install-dir', `./build/oss/kibana-${PKG_VERSION}-${process.platform}-x86_64`,
'--kibana-install-dir', KIBANA_INSTALL_DIR,
'--',
'--server.maxPayloadBytes=1648576',
],
@ -227,7 +228,7 @@ module.exports = function (grunt) {
'--esFrom', esFrom,
'--bail',
'--debug',
'--kibana-install-dir', `./build/oss/kibana-${PKG_VERSION}-${process.platform}-x86_64`,
'--kibana-install-dir', KIBANA_INSTALL_DIR,
'--',
'--server.maxPayloadBytes=1648576',
],

2
test/scripts/jenkins_selenium.sh
View file

@ -5,7 +5,7 @@ source "$(dirname $0)/../../src/dev/ci_setup/setup.sh"
source "$(dirname $0)/../../src/dev/ci_setup/git_setup.sh"
source "$(dirname $0)/../../src/dev/ci_setup/java_setup.sh"
node scripts/build --release --debug --oss;
node scripts/build --debug --oss;
export TEST_BROWSER_HEADLESS=1
export TEST_ES_FROM=${TEST_ES_FROM:-source}