From 25c53a44b96446673deadcb7c5d9e7de41a5e210 Mon Sep 17 00:00:00 2001
From: LeeDr <lee.drengenberg@elastic.co>
Date: Thu, 1 Oct 2020 22:22:54 -0500
Subject: [PATCH] define integrationTestRoot in config file and use to define
 screenshots and esArchiver dirs

---
 .../apps/metricbeat/_metricbeat_dashboard.js    |  3 +--
 .../config.stack_functional_integration_base.js | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js b/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js
index 42f707fb77854..0ce09e8f59d2d 100644
--- a/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js
+++ b/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js
@@ -5,7 +5,6 @@
  */
 
 import expect from '@kbn/expect';
-import { REPO_ROOT } from '@kbn/dev-utils';
 
 export default function ({ getService, getPageObjects, updateBaselines }) {
   const screenshot = getService('screenshots');
@@ -15,7 +14,7 @@ export default function ({ getService, getPageObjects, updateBaselines }) {
 
   describe('check metricbeat Dashboard', function () {
     before(async function () {
-      await esArchiver.load(`${REPO_ROOT}/../integration-test/test/es_archives/metricbeat`);
+      await esArchiver.load('metricbeat');
 
       // this navigateToActualURL takes the place of navigating to the dashboard landing page,
       // filtering on the dashboard name, selecting it, setting the timepicker, and going to full screen
diff --git a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
index a838b129242a1..7c71b1fa180d5 100644
--- a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
+++ b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
@@ -16,10 +16,17 @@ const log = new ToolingLog({
   level: 'info',
   writeTo: process.stdout,
 });
+log.info(`REPO_ROOT = ${REPO_ROOT}`);
 log.info(`WORKSPACE in config file ${process.env.WORKSPACE}`);
-const stateFilePath = process.env.WORKSPACE
-  ? `${process.env.WORKSPACE}/qa/envvars.sh`
-  : `${REPO_ROOT}/../integration-test/qa/envvars.sh`;
+
+const integrationTestRoot = process.env.WORKSPACE
+  ? process.env.WORKSPACE
+  : `${REPO_ROOT}/../integration-test`;
+log.info(`integrationTestRoot = ${integrationTestRoot}`);
+
+// const stateFilePath = resolve(integrationTestRoot, '/qa/envvars.sh');
+const stateFilePath = `${integrationTestRoot}/qa/envvars.sh`;
+log.info(`stateFilePath = ${stateFilePath}`);
 
 const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`);
 
@@ -46,11 +53,11 @@ export default async ({ readConfigFile }) => {
     security: { disableTestUser: true },
     // choose where screenshots should be saved
     screenshots: {
-      directory: resolve(`${REPO_ROOT}/../integration-test`, 'test/screenshots'),
+      directory: resolve(integrationTestRoot, 'test/screenshots'),
     },
     // choose where esArchiver should load archives from
     esArchiver: {
-      directory: resolve(`${REPO_ROOT}/../integration-test`, 'test/es_archives'),
+      directory: resolve(integrationTestRoot, 'test/es_archives'),
     },
   };
   return settings;