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

Signed-off-by: Tyler Smalley <[email protected]> Co-authored-by: Kibana Machine <[email protected]> # Conflicts: # .ci/packer_cache_for_branch.sh
elastic · Feb 9, 2021 · 4ecef99 · 4ecef99
1 parent 059c168
commit 4ecef99
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 32 deletions.
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
@@ -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(),

diff --git a/packages/kbn-test/src/legacy_es/legacy_es_test_cluster.js b/packages/kbn-test/src/legacy_es/legacy_es_test_cluster.js
@@ -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(),

diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
@@ -30,7 +30,7 @@ describe('migration v2', () => {
       adjustTimeout: (t: number) => jest.setTimeout(t),
       settings: {
         es: {
-          license: oss ? 'oss' : 'trial',
+          license: 'trial',
           dataArchive,
         },
       },

diff --git a/...re/server/saved_objects/migrationsv2/integration_tests/migration_7.7.2_xpack_100k.test.ts b/...re/server/saved_objects/migrationsv2/integration_tests/migration_7.7.2_xpack_100k.test.ts
@@ -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,
         },
       },

diff --git a/src/core/test_helpers/kbn_server.ts b/src/core/test_helpers/kbn_server.ts
@@ -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') {

diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh
@@ -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

diff --git a/test/api_integration/config.js b/test/api_integration/config.js
@@ -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: [

diff --git a/test/common/config.js b/test/common/config.js
@@ -21,9 +21,7 @@ export default function () {
     servers,
 
     esTestCluster: {
-      license: 'oss',
-      from: 'snapshot',
-      serverArgs: [],
+      serverArgs: ['xpack.security.enabled=false'],
     },
 
     kbnTestServer: {

diff --git a/test/common/services/deployment.ts b/test/common/services/deployment.ts
@@ -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> {

diff --git a/test/examples/config.js b/test/examples/config.js
@@ -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'),

diff --git a/test/functional/config.js b/test/functional/config.js
@@ -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: [

diff --git a/test/plugin_functional/config.ts b/test/plugin_functional/config.ts
@@ -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'),

diff --git a/test/server_integration/config.js b/test/server_integration/config.js
@@ -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: [

diff --git a/test/server_integration/http/ssl/config.js b/test/server_integration/http/ssl/config.js
@@ -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: [

diff --git a/test/server_integration/http/ssl_redirect/config.js b/test/server_integration/http/ssl_redirect/config.js
@@ -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: [

diff --git a/test/server_integration/http/ssl_with_p12/config.js b/test/server_integration/http/ssl_with_p12/config.js
@@ -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: [

diff --git a/test/server_integration/http/ssl_with_p12_intermediate/config.js b/test/server_integration/http/ssl_with_p12_intermediate/config.js
@@ -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: [