From 4f253233e701aca8cec0855855dfe0bea4290b13 Mon Sep 17 00:00:00 2001 From: cauemarcondes Date: Tue, 15 Feb 2022 16:27:57 -0500 Subject: [PATCH 1/4] removing package registry docker --- x-pack/plugins/apm/ftr_e2e/ftr_config.ts | 5 ----- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config.ts index 84d1c40930c70..a3edc9a669a56 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts +++ b/x-pack/plugins/apm/ftr_e2e/ftr_config.ts @@ -41,11 +41,6 @@ async function config({ readConfigFile }: FtrConfigProviderContext) { '--csp.warnLegacyBrowsers=false', // define custom kibana server args here `--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`, - - // Fleet config - `--xpack.fleet.packages.0.name=endpoint`, - `--xpack.fleet.packages.0.version=latest`, - `--xpack.fleet.registryUrl=http://localhost:${packageRegistryPort}`, ], }, }; diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts index 8fc87b49a6607..c1d6e54ccf21f 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts +++ b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts @@ -30,16 +30,6 @@ async function ftrConfigRun({ readConfigFile }: FtrConfigProviderContext) { return { ...kibanaConfig.getAll(), testRunner, - dockerServers: defineDockerServersConfig({ - registry: { - enabled: true, - image: dockerImage, - portInContainer: 8080, - port: packageRegistryPort, - args: dockerArgs, - waitForLogLine: 'package manifests loaded', - }, - }), }; } From 5b44678d6cb9ee72188da652e9499f84f44067ce Mon Sep 17 00:00:00 2001 From: cauemarcondes Date: Tue, 15 Feb 2022 16:35:06 -0500 Subject: [PATCH 2/4] unused imports --- x-pack/plugins/apm/ftr_e2e/ftr_config.ts | 3 --- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config.ts index a3edc9a669a56..ec2e8d05a97dd 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts +++ b/x-pack/plugins/apm/ftr_e2e/ftr_config.ts @@ -8,9 +8,6 @@ import { FtrConfigProviderContext } from '@kbn/test'; import { CA_CERT_PATH } from '@kbn/dev-utils'; -// Used to spin up a docker container with package registry service that will be used by fleet -export const packageRegistryPort = 1234; - async function config({ readConfigFile }: FtrConfigProviderContext) { const kibanaCommonTestsConfig = await readConfigFile( require.resolve('../../../../test/common/config.js') diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts index c1d6e54ccf21f..865f5d3742ffc 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts +++ b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts @@ -5,16 +5,12 @@ * 2.0. */ -import { defineDockerServersConfig, FtrConfigProviderContext } from '@kbn/test'; +import { FtrConfigProviderContext } from '@kbn/test'; import cypress from 'cypress'; import path from 'path'; import { cypressStart } from './cypress_start'; -import { packageRegistryPort } from './ftr_config'; import { FtrProviderContext } from './ftr_provider_context'; -export const dockerImage = - 'docker.elastic.co/package-registry/distribution@sha256:de952debe048d903fc73e8a4472bb48bb95028d440cba852f21b863d47020c61'; - async function ftrConfigRun({ readConfigFile }: FtrConfigProviderContext) { const kibanaConfig = await readConfigFile(require.resolve('./ftr_config.ts')); From d517358808334755f230a9fc273160e75e7bae6d Mon Sep 17 00:00:00 2001 From: cauemarcondes Date: Tue, 15 Feb 2022 17:28:32 -0500 Subject: [PATCH 3/4] not used --- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts index 865f5d3742ffc..5eb2f43ac4552 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts +++ b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts @@ -14,15 +14,6 @@ import { FtrProviderContext } from './ftr_provider_context'; async function ftrConfigRun({ readConfigFile }: FtrConfigProviderContext) { const kibanaConfig = await readConfigFile(require.resolve('./ftr_config.ts')); - // mount the config file for the package registry - const dockerArgs: string[] = [ - '-v', - `${path.join( - path.dirname(__filename), - './apis/fixtures/package_registry_config.yml' - )}:/package-registry/config.yml`, - ]; - return { ...kibanaConfig.getAll(), testRunner, From 30f8bf9ca28af87c445ee4a81b25a44f5c34bc07 Mon Sep 17 00:00:00 2001 From: cauemarcondes Date: Tue, 15 Feb 2022 18:26:10 -0500 Subject: [PATCH 4/4] fixing ts --- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts index 5eb2f43ac4552..768ad9b3f79f6 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts +++ b/x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts @@ -7,7 +7,6 @@ import { FtrConfigProviderContext } from '@kbn/test'; import cypress from 'cypress'; -import path from 'path'; import { cypressStart } from './cypress_start'; import { FtrProviderContext } from './ftr_provider_context';