From 0cd79e0ca36b45ba307b565b6d5e846055353db7 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Wed, 27 Jan 2021 12:13:15 +0100
Subject: [PATCH] Enable v2 so migrations, disable in FTR tests (#89297)

* Enable v2 so migrations, disable in FTR tests

* Disable v2 migrations for ui_settings integration tests

* Disable v2 migrations for reporting without serucity api integration test
# Conflicts:
#	test/common/config.js
---
 src/core/server/saved_objects/saved_objects_config.ts          | 2 +-
 src/core/server/ui_settings/integration_tests/lib/servers.ts   | 3 +++
 test/common/config.js                                          | 2 ++
 .../reporting_without_security.config.ts                       | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/server/saved_objects/saved_objects_config.ts b/src/core/server/saved_objects/saved_objects_config.ts
index 82db64daf2bd3e..0885a52078f5cb 100644
--- a/src/core/server/saved_objects/saved_objects_config.ts
+++ b/src/core/server/saved_objects/saved_objects_config.ts
@@ -18,7 +18,7 @@ export const savedObjectsMigrationConfig = {
     pollInterval: schema.number({ defaultValue: 1500 }),
     skip: schema.boolean({ defaultValue: false }),
     // TODO migrationsV2: remove/deprecate once we release migrations v2
-    enableV2: schema.boolean({ defaultValue: false }),
+    enableV2: schema.boolean({ defaultValue: true }),
   }),
 };
 
diff --git a/src/core/server/ui_settings/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
index f181272030ae1d..b5198b19007d05 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -37,6 +37,9 @@ export async function startServers() {
     adjustTimeout: (t) => jest.setTimeout(t),
     settings: {
       kbn: {
+        migrations: {
+          enableV2: false,
+        },
         uiSettings: {
           overrides: {
             foo: 'bar',
diff --git a/test/common/config.js b/test/common/config.js
index 2f459f1b1721f8..2cb2bbd8c11da4 100644
--- a/test/common/config.js
+++ b/test/common/config.js
@@ -57,6 +57,8 @@ export default function () {
         `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'newsfeed')}`,
         `--newsfeed.service.urlRoot=${servers.kibana.protocol}://${servers.kibana.hostname}:${servers.kibana.port}`,
         `--newsfeed.service.pathTemplate=/api/_newsfeed-FTS-external-service-simulators/kibana/v{VERSION}.json`,
+        // Disable v2 migrations in tests for now
+        '--migrations.enableV2=false',
       ],
     },
     services,
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
index 4a95a15169b590..11182bbcdb3b09 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
@@ -32,6 +32,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     kbnTestServer: {
       ...apiConfig.get('kbnTestServer'),
       serverArgs: [
+        `--migrations.enableV2=false`,
         `--elasticsearch.hosts=${formatUrl(esTestConfig.getUrlParts())}`,
         `--logging.json=false`,
         `--server.maxPayloadBytes=1679958`,