Revert "Revert: [7.x] [FTR][CI] Use default distribution for all tests (

elastic#102019)" This reverts commit c272bdb.
tylersmalley · Jun 17, 2021 · 35a2f4e · 35a2f4e
1 parent 3f80932
commit 35a2f4e
Show file tree

Hide file tree

Showing 72 changed files with 2,496 additions and 4,903 deletions.
diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
@@ -72,11 +72,7 @@ def agentProcess(Map params = [:]) {
       ]) {
         task {
           if (config.needBuild) {
-            if (!config.isXpack) {
-              kibanaPipeline.buildOss()
-            } else {
-              kibanaPipeline.buildXpack()
-            }
+            kibanaPipeline.buildKibana()
           }
 
           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_xpack_build_kibana.sh', 'Build Default Distributable')
+          kibanaPipeline.bash('test/scripts/jenkins_build_kibana.sh', 'Build 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,12 +37,8 @@ kibanaPipeline(timeoutMinutes: 210) {
           ])
 
           task {
-            kibanaPipeline.buildOss(6)
+            kibanaPipeline.buildKibana(16)
             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,6 +168,7 @@ 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,13 +8,14 @@
 
 import { ToolingLog } from '@kbn/dev-utils';
 
-import { KbnClientRequester, ReqOptions } from './kbn_client_requester';
-import { KbnClientStatus } from './kbn_client_status';
+import { KbnClientImportExport } from './kbn_client_import_export';
 import { KbnClientPlugins } from './kbn_client_plugins';
-import { KbnClientVersion } from './kbn_client_version';
+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 { KbnClientImportExport } from './kbn_client_import_export';
+import { KbnClientVersion } from './kbn_client_version';
 
 export interface KbnClientOptions {
   url: string;
@@ -29,6 +30,7 @@ export class KbnClient {
   readonly plugins: KbnClientPlugins;
   readonly version: KbnClientVersion;
   readonly savedObjects: KbnClientSavedObjects;
+  readonly spaces: KbnClientSpaces;
   readonly uiSettings: KbnClientUiSettings;
   readonly importExport: KbnClientImportExport;
 
@@ -59,6 +61,7 @@ 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,

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,6 +121,8 @@ 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
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { KbnClientRequester, uriencode } from './kbn_client_requester';
+
+interface UpdateBody {
+  name: string;
+  description?: string;
+  disabledFeatures?: string | string[];
+  initials?: string;
+  color?: string;
+  imageUrl?: string;
+}
+
+interface CreateBody extends UpdateBody {
+  id: string;
+}
+
+export class KbnClientSpaces {
+  constructor(private readonly requester: KbnClientRequester) {}
+
+  async create(body: CreateBody) {
+    await this.requester.request({
+      method: 'POST',
+      path: '/api/spaces/space',
+      body,
+    });
+  }
+
+  async update(id: string, body: UpdateBody) {
+    await this.requester.request({
+      method: 'PUT',
+      path: uriencode`/api/spaces/space/${id}`,
+      body,
+    });
+  }
+
+  async get(id: string) {
+    const { data } = await this.requester.request({
+      method: 'GET',
+      path: uriencode`/api/spaces/space/${id}`,
+    });
+
+    return data;
+  }
+
+  async list() {
+    const { data } = await this.requester.request({
+      method: 'GET',
+      path: '/api/spaces/space',
+    });
+
+    return data;
+  }
+
+  async delete(id: string) {
+    await this.requester.request({
+      method: 'DELETE',
+      path: uriencode`/api/spaces/space/${id}`,
+    });
+  }
+}
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
@@ -40,6 +40,7 @@ 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',
@@ -60,8 +61,6 @@ export const IGNORE_FILE_GLOBS = [
   'x-pack/plugins/apm/e2e/**/*',
 
   'x-pack/plugins/maps/server/fonts/**/*',
-  // packages for the ingest manager's api integration tests could be valid semver which has dashes
-  'x-pack/test/fleet_api_integration/apis/fixtures/test_packages/**/*',
 
   // Bazel default files
   '**/WORKSPACE.bazel',
@@ -97,7 +96,6 @@ export const IGNORE_DIRECTORY_GLOBS = [
   ...KEBAB_CASE_DIRECTORY_GLOBS,
   'src/babel-*',
   'packages/*',
-  'test/functional/fixtures/es_archiver/visualize_source-filters',
   'packages/kbn-pm/src/utils/__fixtures__/*',
   'x-pack/dev-tools',
   'packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack',

diff --git a/test/accessibility/apps/dashboard_panel.ts b/test/accessibility/apps/dashboard_panel.ts
@@ -63,6 +63,8 @@ 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: 20,
+          kibanaSavedObjectsLoaded: 23,
         });
       });
 

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,20 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
   const es = getService('es');
 
   describe('telemetry API', () => {
-    before(() => esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/basic'));
-    after(() => esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/basic'));
+    before(async () => {
+      await kibanaServer.importExport.load(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
+      );
+    });
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
+      );
+    });
 
     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 esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
+  const SPACE_ID = 'ftr-so-bulk-create';
 
   const BULK_REQUESTS = [
     {
@@ -38,103 +38,61 @@ export default function ({ getService }: FtrProviderContext) {
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
-    });
-
-    describe('with kibana index', () => {
-      before(() =>
-        esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/basic')
-      );
-      after(() =>
-        esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/basic')
+      await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
+      await kibanaServer.importExport.load(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json',
+        { space: SPACE_ID }
       );
-
-      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',
-                  },
-                  migrationVersion: {
-                    dashboard: resp.body.saved_objects[1].migrationVersion.dashboard,
-                  },
-                  coreMigrationVersion: KIBANA_VERSION,
-                  references: [],
-                  namespaces: ['default'],
-                },
-              ],
-            });
-          }));
-
-      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*')
-      );
+    after(() => kibanaServer.spaces.delete(SPACE_ID));
 
-      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,
-                  },
+    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,
+                },
+              },
+              {
+                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',
                 },
-                {
-                  id: BULK_REQUESTS[1].id,
-                  type: BULK_REQUESTS[1].type,
-                  error: {
-                    error: 'Internal Server Error',
-                    message: 'An internal server error occurred',
-                    statusCode: 500,
-                  },
+                migrationVersion: {
+                  dashboard: resp.body.saved_objects[1].migrationVersion.dashboard,
                 },
-              ],
-            });
+                coreMigrationVersion: KIBANA_VERSION,
+                references: [],
+                namespaces: [SPACE_ID],
+              },
+            ],
           });
-      });
-    });
+        }));
+
+    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/)
+          );
+        }));
   });
 }