Skip to content

Commit

Permalink
commit the first handfull. Committing due to it being obvious the ser…
Browse files Browse the repository at this point in the history
…vices stanza was missing.
  • Loading branch information
wayneseymour committed Aug 30, 2024
1 parent 6f373d0 commit 8385a47
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import { FtrConfigProviderContext } from '@kbn/test';
import { CA_CERT_PATH } from '@kbn/dev-utils';
import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
import { cypressTestRunner } from './cypress_test_runner';
import { FtrProviderContext } from './ftr_provider_context';

Expand All @@ -21,6 +23,11 @@ async function ftrConfig({ readConfigFile }: FtrConfigProviderContext) {
return {
...kibanaCommonTestsConfig.getAll(),

services: {
...commonFunctionalServices,
...commonFunctionalUIServices,
},

esTestCluster: {
...xpackFunctionalTestsConfig.get('esTestCluster'),
serverArgs: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import { FtrConfigProviderContext } from '@kbn/test';
import { CA_CERT_PATH } from '@kbn/dev-utils';
import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
import path from 'path';

const kibanaYamlFilePath = path.join(__dirname, './ftr_kibana.yml');
Expand All @@ -22,6 +24,11 @@ async function ftrConfig({ readConfigFile }: FtrConfigProviderContext) {
return {
...kibanaCommonTestsConfig.getAll(),

services: {
...commonFunctionalServices,
...commonFunctionalUIServices,
},

esTestCluster: {
...xpackFunctionalTestsConfig.get('esTestCluster'),
serverArgs: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import { FtrConfigProviderContext } from '@kbn/test';
import { CA_CERT_PATH } from '@kbn/dev-utils';
import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
import path from 'path';

const kibanaYamlFilePath = path.join(__dirname, './ftr_kibana.yml');
Expand All @@ -22,6 +24,11 @@ async function ftrConfig({ readConfigFile }: FtrConfigProviderContext) {
return {
...kibanaCommonTestsConfig.getAll(),

services: {
...commonFunctionalServices,
...commonFunctionalUIServices,
},

esTestCluster: {
...xpackFunctionalTestsConfig.get('esTestCluster'),
serverArgs: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
...commonFunctionalServices,
...commonFunctionalUIServices,
},

esTestCluster: {
...xpackFunctionalTestsConfig.get('esTestCluster'),
serverArgs: [
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/observability_solution/uptime/e2e/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import { FtrConfigProviderContext } from '@kbn/test';
import { CA_CERT_PATH } from '@kbn/dev-utils';
import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
import { readKibanaConfig } from './tasks/read_kibana_config';
const MANIFEST_KEY = 'xpack.uptime.service.manifestUrl';
const SERVICE_PASSWORD = 'xpack.uptime.service.password';
Expand All @@ -29,6 +31,11 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
return {
...kibanaCommonTestsConfig.getAll(),

services: {
...commonFunctionalServices,
...commonFunctionalUIServices,
},

esTestCluster: {
...xpackFunctionalTestsConfig.get('esTestCluster'),
serverArgs: [
Expand Down

0 comments on commit 8385a47

Please sign in to comment.