Enable v2 so migrations, disable in FTR tests (elastic#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
rudolf · Feb 1, 2021 · 0cd79e0 · 0cd79e0
1 parent 43927b8
commit 0cd79e0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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`,