resolve merge conflict (#143790)

x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js

@@ -12,6 +12,9 @@ import { REPO_ROOT } from '@kbn/utils';
 import chalk from 'chalk';
 import { esTestConfig, kbnTestConfig } from '@kbn/test';
 import { TriggersActionsPageProvider } from '../../functional_with_es_ssl/page_objects/triggers_actions_ui_page';
+import { ReportingAPIProvider } from '../../upgrade/services/reporting_upgrade_services';
+import { MapsHelper } from '../../upgrade/services/maps_upgrade_services';
+import { RulesHelper } from '../../upgrade/services/rules_upgrade_services';
 
 const log = new ToolingLog({
   level: 'info',
@@ -24,6 +27,7 @@ const testsFolder = '../apps';
 const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`);
 
 export default async ({ readConfigFile }) => {
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config'));
   const xpackFunctionalConfig = await readConfigFile(
     require.resolve('../../functional/config.base.js')
   );
@@ -65,6 +69,13 @@ export default async ({ readConfigFile }) => {
     screenshots: {
       directory: resolve(INTEGRATION_TEST_ROOT, 'test/screenshots'),
     },
+    services: {
+      ...apiConfig.get('services'),
+      ...xpackFunctionalConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
+      mapsHelper: MapsHelper,
+      rulesHelper: RulesHelper,
+    },
   };
   return settings;
 };