Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import {
} from '@kbn/dataset-quality-plugin/server/test_helpers/create_dataset_quality_users/authentication';
import { ScoutTestRunConfigCategory } from '@kbn/scout-info';
import type { FtrConfigProviderContext } from '@kbn/test';
import { fleetPackageRegistryDockerImage, defineDockerServersConfig } from '@kbn/test';
import path from 'path';
import { packageRegistryDocker, defineDockerServersConfig } from '@kbn/test';
import supertest from 'supertest';
import type { UrlObject } from 'url';
import { format } from 'url';
Expand Down Expand Up @@ -89,13 +88,10 @@ export function createTestConfig(
const { license, name, kibanaConfig } = config;

return async ({ readConfigFile }: FtrConfigProviderContext) => {
const packageRegistryConfig = path.join(__dirname, './fixtures/package_registry_config.yml');
const xPackAPITestsConfig = await readConfigFile(
require.resolve('../../api_integration/config.ts')
);

const dockerArgs: string[] = ['-v', `${packageRegistryConfig}:/package-registry/config.yml`];

const services = xPackAPITestsConfig.get('services');
const servers = xPackAPITestsConfig.get('servers');
const kibanaServer = servers.kibana as UrlObject;
Expand All @@ -115,15 +111,7 @@ export function createTestConfig(
testFiles: [require.resolve('../tests')],
servers,
dockerServers: defineDockerServersConfig({
registry: {
enabled: !!dockerRegistryPort,
image: fleetPackageRegistryDockerImage,
portInContainer: 8080,
port: dockerRegistryPort,
args: dockerArgs,
waitForLogLine: 'package manifests loaded',
waitForLogLineTimeoutMs: 60 * 4 * 1000, // 4 minutes
},
registry: packageRegistryDocker,
}),
servicesRequiredForTestAnalysis: ['datasetQualityFtrConfig', 'registry'],
services: {
Expand Down