move docker servers config to xpack config

elastic · May 15, 2020 · e59d7e8 · e59d7e8
1 parent bb5efde
commit e59d7e8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 30 deletions.
diff --git a/test/functional/config.js b/test/functional/config.js
@@ -17,9 +17,6 @@
  * under the License.
  */
 
-import { defineDockerServersConfig } from '@kbn/test';
-import { first, tap } from 'rxjs/operators';
-
 import { pageObjects } from './page_objects';
 import { services } from './services';
 
@@ -44,30 +41,6 @@ export default async function({ readConfigFile }) {
     pageObjects,
     services,
 
-    dockerServers: defineDockerServersConfig(
-      process.env.FLEET_PACKAGE_REGISTRY_PORT
-        ? {
-            helloWorld: {
-              image: 'docker.elastic.co/package-registry/package-registry:master',
-              portInContainer: 8080,
-              port: process.env.FLEET_PACKAGE_REGISTRY_PORT,
-              waitForLogLine: 'package manifests loaded into memory',
-              async waitFor(server, logLine$) {
-                await logLine$
-                  .pipe(
-                    first(line => line.includes('Package registry started')),
-                    tap(line => {
-                      console.log(`waitFor found log line "${line}"`);
-                      console.log('marking server ready', server);
-                    })
-                  )
-                  .toPromise();
-              },
-            },
-          }
-        : {}
-    ),
-
     servers: commonConfig.get('servers'),
 
     esTestCluster: commonConfig.get('esTestCluster'),
@@ -78,7 +51,6 @@ export default async function({ readConfigFile }) {
         ...commonConfig.get('kbnTestServer.serverArgs'),
         '--oss',
         '--telemetry.optIn=false',
-        `--xpack.ingestManager.epm.registryUrl=http://localhost:${process.env.FLEET_PACKAGE_REGISTRY_PORT}`,
       ],
     },
 

diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-/* eslint-disable import/no-default-export */
-
 import { resolve } from 'path';
 
+import { defineDockerServersConfig } from '@kbn/test';
+import { first, tap } from 'rxjs/operators';
+
 import { services } from './services';
 import { pageObjects } from './page_objects';
 
@@ -69,6 +70,30 @@ export default async function({ readConfigFile }) {
 
     servers: kibanaFunctionalConfig.get('servers'),
 
+    dockerServers: defineDockerServersConfig(
+      process.env.FLEET_PACKAGE_REGISTRY_PORT
+        ? {
+            helloWorld: {
+              image: 'docker.elastic.co/package-registry/package-registry:master',
+              portInContainer: 8080,
+              port: process.env.FLEET_PACKAGE_REGISTRY_PORT,
+              waitForLogLine: 'package manifests loaded into memory',
+              async waitFor(server, logLine$) {
+                await logLine$
+                  .pipe(
+                    first(line => line.includes('Package registry started')),
+                    tap(line => {
+                      console.log(`waitFor found log line "${line}"`);
+                      console.log('marking server ready', server);
+                    })
+                  )
+                  .toPromise();
+              },
+            },
+          }
+        : {}
+    ),
+
     esTestCluster: {
       license: 'trial',
       from: 'snapshot',
@@ -89,6 +114,8 @@ export default async function({ readConfigFile }) {
         '--xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"', // server restarts should not invalidate active sessions
         '--xpack.encryptedSavedObjects.encryptionKey="DkdXazszSCYexXqz4YktBGHCRkV6hyNK"',
         '--timelion.ui.enabled=true',
+        `--xpack.ingestManager.enabled=true`,
+        `--xpack.ingestManager.epm.registryUrl=http://localhost:${process.env.FLEET_PACKAGE_REGISTRY_PORT}`,
       ],
     },
     uiSettings: {