[7.x] define integrationTestRoot in config file and use to define scr…

…eensho… (#79247) (#81899)
elastic · Oct 28, 2020 · 8ea6bc4 · 8ea6bc4
1 parent ab26b2c
commit 8ea6bc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -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
@@ -16,10 +16,14 @@ 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 INTEGRATION_TEST_ROOT = process.env.WORKSPACE || resolve(REPO_ROOT, '../integration-test');
+log.info(`INTEGRATION_TEST_ROOT = ${INTEGRATION_TEST_ROOT}`);
+
+const stateFilePath = resolve(INTEGRATION_TEST_ROOT, 'qa/envvars.sh');
+log.info(`stateFilePath = ${stateFilePath}`);
 
 const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`);
 
@@ -46,11 +50,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(INTEGRATION_TEST_ROOT, 'test/screenshots'),
     },
     // choose where esArchiver should load archives from
     esArchiver: {
-      directory: resolve(`${REPO_ROOT}/../integration-test`, 'test/es_archives'),
+      directory: resolve(INTEGRATION_TEST_ROOT, 'test/es_archives'),
     },
   };
   return settings;