github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use default ES distribution for functional tests (#88737) (#90694)

Browse source 
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	.ci/packer_cache_for_branch.sh
This commit is contained in:
Tyler Smalley 2021-02-08 22:57:34 -08:00 • committed by GitHub
parent 059c168a96
commit 4ecef99ee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
View file

@ -169,7 +169,7 @@ export const schema = Joi.object()
esTestCluster: Joi.object()
.keys({
license: Joi.string().default('oss'),
license: Joi.string().default('basic'),
from: Joi.string().default('snapshot'),
serverArgs: Joi.array(),
serverEnvVars: Joi.object(),

2
packages/kbn-test/src/legacy_es/legacy_es_test_cluster.js
View file

@ -22,7 +22,7 @@ export function createLegacyEsTestCluster(options = {}) {
const {
port = esTestConfig.getPort(),
password = 'changeme',
license = 'oss',
license = 'basic',
log,
basePath = resolve(KIBANA_ROOT, '.es'),
esFrom = esTestConfig.getBuildFrom(),

2
src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
View file

@ -30,7 +30,7 @@ describe('migration v2', () => {
adjustTimeout: (t: number) => jest.setTimeout(t),
settings: {
es: {
license: oss ? 'oss' : 'trial',
license: 'trial',
dataArchive,
},
},

2
src/core/server/saved_objects/migrationsv2/integration_tests/migration_7.7.2_xpack_100k.test.ts
View file

@ -32,7 +32,7 @@ describe.skip('migration from 7.7.2-xpack with 100k objects', () => {
adjustTimeout: (t: number) => jest.setTimeout(600000),
settings: {
es: {
license: oss ? 'oss' : 'trial',
license: 'trial',
dataArchive,
},
},

4
src/core/test_helpers/kbn_server.ts
View file

@ -185,7 +185,7 @@ export function createTestServers({
adjustTimeout: (timeout: number) => void;
settings?: {
es?: {
license: 'oss' | 'basic' | 'gold' | 'trial';
license: 'basic' | 'gold' | 'trial';
[key: string]: any;
};
kbn?: {
@ -208,7 +208,7 @@ export function createTestServers({
if (!adjustTimeout) {
throw new Error('adjustTimeout is required in order to avoid flaky tests');
}
const license = get(settings, 'es.license', 'oss');
const license = get(settings, 'es.license', 'basic');
const usersToBeAdded = get(settings, 'users', []);
if (usersToBeAdded.length > 0) {
if (license !== 'trial') {

2
src/dev/ci_setup/setup.sh
View file

@ -32,8 +32,6 @@ yarn kbn bootstrap
###
echo " -- downloading es snapshot"
node scripts/es snapshot --download-only;
node scripts/es snapshot --license=oss --download-only;
###
### verify no git modifications

5
test/api_integration/config.js
View file

@ -19,7 +19,10 @@ export default async function ({ readConfigFile }) {
junit: {
reportName: 'API Integration Tests',
},
esTestCluster: commonConfig.get('esTestCluster'),
esTestCluster: {
...functionalConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
serverArgs: [

4
test/common/config.js
View file

@ -21,9 +21,7 @@ export default function () {
servers,
esTestCluster: {
license: 'oss',
from: 'snapshot',
serverArgs: [],
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {

12
test/common/services/deployment.ts
View file

@ -35,17 +35,7 @@ export function DeploymentProvider({ getService }: FtrProviderContext) {
* Useful for functional testing in cloud environment
*/
async isOss() {
const baseUrl = this.getEsHostPort();
const username = config.get('servers.elasticsearch.username');
const password = config.get('servers.elasticsearch.password');
const response = await fetch(baseUrl + '/_xpack', {
method: 'get',
headers: {
'Content-Type': 'application/json',
Authorization: 'Basic ' + Buffer.from(username + ':' + password).toString('base64'),
},
});
return response.status !== 200;
return config.get('kbnTestServer.serverArgs').indexOf('--oss') > -1;
},
async isCloud(): Promise<boolean> {

5
test/examples/config.js
View file

@ -34,7 +34,10 @@ export default async function ({ readConfigFile }) {
},
pageObjects: functionalConfig.get('pageObjects'),
servers: functionalConfig.get('servers'),
esTestCluster: functionalConfig.get('esTestCluster'),
esTestCluster: {
...functionalConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
apps: functionalConfig.get('apps'),
esArchiver: {
directory: path.resolve(__dirname, '../es_archives'),

6
test/functional/config.js
View file

@ -32,8 +32,10 @@ export default async function ({ readConfigFile }) {
servers: commonConfig.get('servers'),
esTestCluster: commonConfig.get('esTestCluster'),
esTestCluster: {
...commonConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...commonConfig.get('kbnTestServer'),
serverArgs: [

5
test/plugin_functional/config.ts
View file

@ -36,7 +36,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
},
pageObjects: functionalConfig.get('pageObjects'),
servers: functionalConfig.get('servers'),
esTestCluster: functionalConfig.get('esTestCluster'),
esTestCluster: {
...functionalConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
apps: functionalConfig.get('apps'),
esArchiver: {
directory: path.resolve(__dirname, '../es_archives'),

5
test/server_integration/config.js
View file

@ -27,7 +27,10 @@ export default async function ({ readConfigFile }) {
junit: {
reportName: 'Integration Tests',
},
esTestCluster: commonConfig.get('esTestCluster'),
esTestCluster: {
...functionalConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
serverArgs: [

5
test/server_integration/http/ssl/config.js
View file

@ -33,7 +33,10 @@ export default async function ({ readConfigFile }) {
junit: {
reportName: 'Http SSL Integration Tests',
},
esTestCluster: httpConfig.get('esTestCluster'),
esTestCluster: {
...httpConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...httpConfig.get('kbnTestServer'),
serverArgs: [

5
test/server_integration/http/ssl_redirect/config.js
View file

@ -44,7 +44,10 @@ export default async function ({ readConfigFile }) {
junit: {
reportName: 'Http SSL Integration Tests',
},
esTestCluster: httpConfig.get('esTestCluster'),
esTestCluster: {
...httpConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...httpConfig.get('kbnTestServer'),
serverArgs: [

5
test/server_integration/http/ssl_with_p12/config.js
View file

@ -33,7 +33,10 @@ export default async function ({ readConfigFile }) {
junit: {
reportName: 'Http SSL Integration Tests',
},
esTestCluster: httpConfig.get('esTestCluster'),
esTestCluster: {
...httpConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...httpConfig.get('kbnTestServer'),
serverArgs: [

5
test/server_integration/http/ssl_with_p12_intermediate/config.js
View file

@ -33,7 +33,10 @@ export default async function ({ readConfigFile }) {
junit: {
reportName: 'Http SSL Integration Tests',
},
esTestCluster: httpConfig.get('esTestCluster'),
esTestCluster: {
...httpConfig.get('esTestCluster'),
serverArgs: ['xpack.security.enabled=false'],
},
kbnTestServer: {
...httpConfig.get('kbnTestServer'),
serverArgs: [