Revert "[7.x] [FTR][CI] Use default distribution for all tests (#94968)…

… (#99980)" This reverts commit be40e96.
elastic · May 29, 2021 · 5167ba3 · 5167ba3
1 parent 22b7991
commit 5167ba3
Show file tree

Hide file tree

Showing 133 changed files with 6,716 additions and 5,551 deletions.
diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
@@ -73,7 +73,11 @@ def agentProcess(Map params = [:]) {
       ]) {
         task {
           if (config.needBuild) {
-            kibanaPipeline.buildKibana()
+            if (!config.isXpack) {
+              kibanaPipeline.buildOss()
+            } else {
+              kibanaPipeline.buildXpack()
+            }
           }
 
           for(def i = 0; i < config.agentExecutions; i++) {

diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress
@@ -16,7 +16,7 @@ kibanaPipeline(timeoutMinutes: 180) {
         def job = 'xpack-securityCypress'
 
         workers.ci(name: job, size: 'l', ramDisk: true) {
-          kibanaPipeline.bash('test/scripts/jenkins_build_kibana.sh', 'Build Distributable')
+          kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
           kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
           // Temporarily disabled to figure out test flake
           // kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -37,8 +37,12 @@ kibanaPipeline(timeoutMinutes: 210) {
           ])
 
           task {
-            kibanaPipeline.buildKibana(16)
+            kibanaPipeline.buildOss(6)
             tasks.ossCiGroups()
+          }
+
+          task {
+            kibanaPipeline.buildXpack(10, true)
             tasks.xpackCiGroups()
             tasks.xpackCiGroupDocker()
           }

diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -168,7 +168,6 @@ export async function createDefaultSpace({
       index,
       type: '_doc',
       id: 'space:default',
-      refresh: 'wait_for',
       body: {
         type: 'space',
         updated_at: new Date().toISOString(),

diff --git a/packages/kbn-test/src/kbn_client/kbn_client.ts b/packages/kbn-test/src/kbn_client/kbn_client.ts
@@ -8,14 +8,13 @@
 
 import { ToolingLog } from '@kbn/dev-utils';
 
-import { KbnClientImportExport } from './kbn_client_import_export';
-import { KbnClientPlugins } from './kbn_client_plugins';
 import { KbnClientRequester, ReqOptions } from './kbn_client_requester';
-import { KbnClientSavedObjects } from './kbn_client_saved_objects';
-import { KbnClientSpaces } from './kbn_client_spaces';
 import { KbnClientStatus } from './kbn_client_status';
-import { KbnClientUiSettings, UiSettingValues } from './kbn_client_ui_settings';
+import { KbnClientPlugins } from './kbn_client_plugins';
 import { KbnClientVersion } from './kbn_client_version';
+import { KbnClientSavedObjects } from './kbn_client_saved_objects';
+import { KbnClientUiSettings, UiSettingValues } from './kbn_client_ui_settings';
+import { KbnClientImportExport } from './kbn_client_import_export';
 
 export interface KbnClientOptions {
   url: string;
@@ -30,7 +29,6 @@ export class KbnClient {
   readonly plugins: KbnClientPlugins;
   readonly version: KbnClientVersion;
   readonly savedObjects: KbnClientSavedObjects;
-  readonly spaces: KbnClientSpaces;
   readonly uiSettings: KbnClientUiSettings;
   readonly importExport: KbnClientImportExport;
 
@@ -61,13 +59,11 @@ export class KbnClient {
     this.plugins = new KbnClientPlugins(this.status);
     this.version = new KbnClientVersion(this.status);
     this.savedObjects = new KbnClientSavedObjects(this.log, this.requester);
-    this.spaces = new KbnClientSpaces(this.requester);
     this.uiSettings = new KbnClientUiSettings(this.log, this.requester, this.uiSettingDefaults);
     this.importExport = new KbnClientImportExport(
       this.log,
       this.requester,
       this.savedObjects,
-      this.spaces,
       options.importExportDir
     );
   }

diff --git a/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts b/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
@@ -15,7 +15,6 @@ import { ToolingLog, isAxiosResponseError, createFailError } from '@kbn/dev-util
 
 import { KbnClientRequester, uriencode, ReqOptions } from './kbn_client_requester';
 import { KbnClientSavedObjects } from './kbn_client_saved_objects';
-import { KbnClientSpaces } from './kbn_client_spaces';
 
 interface ImportApiResponse {
   success: boolean;
@@ -40,7 +39,6 @@ export class KbnClientImportExport {
     public readonly log: ToolingLog,
     public readonly requester: KbnClientRequester,
     public readonly savedObjects: KbnClientSavedObjects,
-    private readonly spaces: KbnClientSpaces,
     public readonly dir?: string
   ) {}
 
@@ -68,19 +66,6 @@ export class KbnClientImportExport {
     const formData = new FormData();
     formData.append('file', objects.map((obj) => JSON.stringify(obj)).join('\n'), 'import.ndjson');
 
-    if (options?.space) {
-      this.log.info('creating space', options.space);
-
-      try {
-        await this.spaces.create({
-          id: options.space,
-          name: options.space,
-        });
-      } catch (e) {
-        this.log.warning('creating space failed:', e.message);
-      }
-    }
-
     // TODO: should we clear out the existing saved objects?
     const resp = await this.req<ImportApiResponse>(options?.space, {
       method: 'POST',

diff --git a/packages/kbn-test/src/kbn_client/kbn_client_requester.ts b/packages/kbn-test/src/kbn_client/kbn_client_requester.ts
@@ -121,8 +121,6 @@ export class KbnClientRequester {
           responseType: options.responseType,
           // work around https://github.com/axios/axios/issues/2791
           transformResponse: options.responseType === 'text' ? [(x) => x] : undefined,
-          maxContentLength: 30000000,
-          maxBodyLength: 30000000,
           paramsSerializer: (params) => Qs.stringify(params),
         });
 

diff --git a/packages/kbn-test/src/kbn_client/kbn_client_spaces.ts b/packages/kbn-test/src/kbn_client/kbn_client_spaces.ts
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
@@ -40,7 +40,6 @@ export const IGNORE_FILE_GLOBS = [
   '.ci/pipeline-library/**/*',
   'packages/kbn-test/jest-preset.js',
   'test/package/Vagrantfile',
-  'test/**/fixtures/**/*',
 
   // filename must match language code which requires capital letters
   '**/translations/*.json',

diff --git a/test/accessibility/apps/dashboard_panel.ts b/test/accessibility/apps/dashboard_panel.ts
@@ -63,8 +63,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('dashboard panel full screen', async () => {
       const header = await dashboardPanelActions.getPanelHeading('[Flights] Airline Carrier');
       await dashboardPanelActions.toggleContextMenu(header);
-      await dashboardPanelActions.clickContextMenuMoreItem();
-
       await testSubjects.click('embeddablePanelAction-togglePanel');
       await a11y.testAppSnapshot();
     });

diff --git a/test/api_integration/apis/home/sample_data.ts b/test/api_integration/apis/home/sample_data.ts
@@ -43,7 +43,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         expect(resp.body).to.eql({
           elasticsearchIndicesCreated: { kibana_sample_data_flights: 13059 },
-          kibanaSavedObjectsLoaded: 23,
+          kibanaSavedObjectsLoaded: 20,
         });
       });
 

diff --git a/test/api_integration/apis/kql_telemetry/kql_telemetry.ts b/test/api_integration/apis/kql_telemetry/kql_telemetry.ts
@@ -13,12 +13,12 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const kibanaServer = getService('kibanaServer');
+  const esArchiver = getService('esArchiver');
   const es = getService('es');
 
   describe('telemetry API', () => {
-    before(() => kibanaServer.importExport.load('saved_objects/basic'));
-    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
+    before(() => esArchiver.load('saved_objects/basic'));
+    after(() => esArchiver.unload('saved_objects/basic'));
 
     it('should increment the opt *in* counter in the .kibana/kql-telemetry document', async () => {
       await supertest

diff --git a/test/api_integration/apis/saved_objects/bulk_create.ts b/test/api_integration/apis/saved_objects/bulk_create.ts
@@ -12,8 +12,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const kibanaServer = getService('kibanaServer');
-  const SPACE_ID = 'ftr-so-bulk-create';
+  const esArchiver = getService('esArchiver');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   const BULK_REQUESTS = [
     {
@@ -38,57 +38,99 @@ export default function ({ getService }: FtrProviderContext) {
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
-      await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
     });
 
-    after(() => kibanaServer.spaces.delete(SPACE_ID));
+    describe('with kibana index', () => {
+      before(() => esArchiver.load('saved_objects/basic'));
+      after(() => esArchiver.unload('saved_objects/basic'));
 
-    it('should return 200 with individual responses', async () =>
-      await supertest
-        .post(`/s/${SPACE_ID}/api/saved_objects/_bulk_create`)
-        .send(BULK_REQUESTS)
-        .expect(200)
-        .then((resp) => {
-          expect(resp.body).to.eql({
-            saved_objects: [
-              {
-                type: 'visualization',
-                id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                error: {
-                  error: 'Conflict',
-                  message:
-                    'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] conflict',
-                  statusCode: 409,
+      it('should return 200 with individual responses', async () =>
+        await supertest
+          .post(`/api/saved_objects/_bulk_create`)
+          .send(BULK_REQUESTS)
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              saved_objects: [
+                {
+                  type: 'visualization',
+                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                  error: {
+                    error: 'Conflict',
+                    message:
+                      'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] conflict',
+                    statusCode: 409,
+                  },
                 },
-              },
-              {
-                type: 'dashboard',
-                id: 'a01b2f57-fcfd-4864-b735-09e28f0d815e',
-                updated_at: resp.body.saved_objects[1].updated_at,
-                version: resp.body.saved_objects[1].version,
-                attributes: {
-                  title: 'A great new dashboard',
+                {
+                  type: 'dashboard',
+                  id: 'a01b2f57-fcfd-4864-b735-09e28f0d815e',
+                  updated_at: resp.body.saved_objects[1].updated_at,
+                  version: resp.body.saved_objects[1].version,
+                  attributes: {
+                    title: 'A great new dashboard',
+                  },
+                  migrationVersion: {
+                    dashboard: resp.body.saved_objects[1].migrationVersion.dashboard,
+                  },
+                  coreMigrationVersion: KIBANA_VERSION,
+                  references: [],
+                  namespaces: ['default'],
                 },
-                migrationVersion: {
-                  dashboard: resp.body.saved_objects[1].migrationVersion.dashboard,
+              ],
+            });
+          }));
+
+      it('should not return raw id when object id is unspecified', async () =>
+        await supertest
+          .post(`/api/saved_objects/_bulk_create`)
+          .send(BULK_REQUESTS.map(({ id, ...rest }) => rest))
+          .expect(200)
+          .then((resp) => {
+            resp.body.saved_objects.map(({ id }: { id: string }) =>
+              expect(id).not.match(/visualization|dashboard/)
+            );
+          }));
+    });
+
+    describe('without kibana index', () => {
+      before(
+        async () =>
+          // just in case the kibana server has recreated it
+          await esDeleteAllIndices('.kibana*')
+      );
+
+      it('should return 200 with errors', async () => {
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await supertest
+          .post('/api/saved_objects/_bulk_create')
+          .send(BULK_REQUESTS)
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              saved_objects: [
+                {
+                  id: BULK_REQUESTS[0].id,
+                  type: BULK_REQUESTS[0].type,
+                  error: {
+                    error: 'Internal Server Error',
+                    message: 'An internal server error occurred',
+                    statusCode: 500,
+                  },
                 },
-                coreMigrationVersion: KIBANA_VERSION,
-                references: [],
-                namespaces: [SPACE_ID],
-              },
-            ],
+                {
+                  id: BULK_REQUESTS[1].id,
+                  type: BULK_REQUESTS[1].type,
+                  error: {
+                    error: 'Internal Server Error',
+                    message: 'An internal server error occurred',
+                    statusCode: 500,
+                  },
+                },
+              ],
+            });
           });
-        }));
-
-    it('should not return raw id when object id is unspecified', async () =>
-      await supertest
-        .post(`/s/${SPACE_ID}/api/saved_objects/_bulk_create`)
-        .send(BULK_REQUESTS.map(({ id, ...rest }) => rest))
-        .expect(200)
-        .then((resp) => {
-          resp.body.saved_objects.map(({ id }: { id: string }) =>
-            expect(id).not.match(/visualization|dashboard/)
-          );
-        }));
+      });
+    });
   });
 }