From fe35e0de3b337e47bf36f5af8bdc2a00e437f9af Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Thu, 18 Feb 2021 18:45:15 -0500
Subject: [PATCH 1/2] [Fleet] Install Elastic Agent integration by default
 during setup (#91676)

---
 x-pack/plugins/fleet/common/constants/epm.ts       |  1 +
 .../test/fleet_api_integration/apis/fleet_setup.ts | 14 ++++++++++++++
 x-pack/test/fleet_api_integration/config.ts        |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/fleet/common/constants/epm.ts b/x-pack/plugins/fleet/common/constants/epm.ts
index b223139803257..aa17b16b3763c 100644
--- a/x-pack/plugins/fleet/common/constants/epm.ts
+++ b/x-pack/plugins/fleet/common/constants/epm.ts
@@ -15,6 +15,7 @@ export const FLEET_SERVER_PACKAGE = 'fleet_server';
 export const requiredPackages = {
   System: 'system',
   Endpoint: 'endpoint',
+  ElasticAgent: 'elastic_agent',
 } as const;
 
 // these are currently identical. we can separate if they later diverge
diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
index 31d620cd34931..d9f55d9fa0b74 100644
--- a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
@@ -105,5 +105,19 @@ export default function (providerContext: FtrProviderContext) {
         transient_metadata: { enabled: true },
       });
     });
+
+    it('should install default packages', async () => {
+      await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxxx').expect(200);
+
+      const { body: apiResponse } = await supertest
+        .get(`/api/fleet/epm/packages?experimental=true`)
+        .expect(200);
+      const installedPackages = apiResponse.response
+        .filter((p: any) => p.status === 'installed')
+        .map((p: any) => p.name)
+        .sort();
+
+      expect(installedPackages).to.eql(['elastic_agent', 'endpoint', 'system']);
+    });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts
index 444b8c3a68776..b4833d96c407e 100644
--- a/x-pack/test/fleet_api_integration/config.ts
+++ b/x-pack/test/fleet_api_integration/config.ts
@@ -15,7 +15,7 @@ import { defineDockerServersConfig } from '@kbn/test';
 // example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1.
 // It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry.
 export const dockerImage =
-  'docker.elastic.co/package-registry/distribution:5314869e2f6bc01d37b8652f7bda89248950b3a4';
+  'docker.elastic.co/package-registry/distribution:99dadb957d76b704637150d34a7219345cc0aeef';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

From 539f33e53beb9847f2ff4136ea8bba8519c9f375 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Thu, 18 Feb 2021 18:43:43 -0600
Subject: [PATCH 2/2] Revert "[SOM] fix flaky suites (#91809)"

This reverts commit 386afdca8ffc8b5c61aa0c2ce0ea1a3476fd0aa7.
---
 test/functional/apps/management/_import_objects.ts             | 1 +
 .../apps/saved_objects_management/edit_saved_object.ts         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts
index a3daaf8629493..ca8d8c392ce49 100644
--- a/test/functional/apps/management/_import_objects.ts
+++ b/test/functional/apps/management/_import_objects.ts
@@ -23,6 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const log = getService('log');
 
+  // FLAKY: https://github.com/elastic/kibana/issues/89478
   describe('import objects', function describeIndexTests() {
     describe('.ndjson file', () => {
       beforeEach(async function () {
diff --git a/test/functional/apps/saved_objects_management/edit_saved_object.ts b/test/functional/apps/saved_objects_management/edit_saved_object.ts
index 89889088bd73b..81569c5bfc498 100644
--- a/test/functional/apps/saved_objects_management/edit_saved_object.ts
+++ b/test/functional/apps/saved_objects_management/edit_saved_object.ts
@@ -55,7 +55,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await button.click();
   };
 
-  describe('saved objects edition page', () => {
+  // Flaky: https://github.com/elastic/kibana/issues/68400
+  describe.skip('saved objects edition page', () => {
     beforeEach(async () => {
       await esArchiver.load('saved_objects_management/edit_saved_object');
     });