From b46fcd561512ae5449889ac4650b0c76055764ad Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 27 Apr 2020 17:04:22 -0700 Subject: [PATCH] fix karma config to point to right prefix --- tasks/config/karma.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tasks/config/karma.js b/tasks/config/karma.js index 5b3259eb77d14..e846b06718d96 100644 --- a/tasks/config/karma.js +++ b/tasks/config/karma.js @@ -25,6 +25,7 @@ import { DllCompiler } from '../../src/optimize/dynamic_dll_plugin'; const TOTAL_CI_SHARDS = 4; const ROOT = dirname(require.resolve('../../package.json')); +const buildNum = '9007199254740991'; module.exports = function(grunt) { function pickBrowser() { @@ -58,27 +59,27 @@ module.exports = function(grunt) { ...UiSharedDeps.jsDepFilenames.map( chunkFilename => - `http://localhost:5610/bundles/9007199254740991/kbn-ui-shared-deps/${chunkFilename}` + `http://localhost:5610/${buildNum}/bundles/kbn-ui-shared-deps/${chunkFilename}` ), - `http://localhost:5610/bundles/9007199254740991/kbn-ui-shared-deps/${UiSharedDeps.jsFilename}`, + `http://localhost:5610/${buildNum}/bundles/kbn-ui-shared-deps/${UiSharedDeps.jsFilename}`, - 'http://localhost:5610/built_assets/dlls/vendors_runtime.bundle.dll.js', + `http://localhost:5610/${buildNum}/built_assets/dlls/vendors_runtime.bundle.dll.js`, ...DllCompiler.getRawDllConfig().chunks.map( - chunk => `http://localhost:5610/built_assets/dlls/vendors${chunk}.bundle.dll.js` + chunk => `http://localhost:5610/${buildNum}/built_assets/dlls/vendors${chunk}.bundle.dll.js` ), shardNum === undefined - ? `http://localhost:5610/bundles/tests.bundle.js` - : `http://localhost:5610/bundles/tests.bundle.js?shards=${TOTAL_CI_SHARDS}&shard_num=${shardNum}`, + ? `http://localhost:5610/${buildNum}/bundles/tests.bundle.js` + : `http://localhost:5610/${buildNum}/bundles/tests.bundle.js?shards=${TOTAL_CI_SHARDS}&shard_num=${shardNum}`, - `http://localhost:5610/bundles/9007199254740991/kbn-ui-shared-deps/${UiSharedDeps.baseCssDistFilename}`, + `http://localhost:5610/${buildNum}/bundles/kbn-ui-shared-deps/${UiSharedDeps.baseCssDistFilename}`, // this causes tilemap tests to fail, probably because the eui styles haven't been // included in the karma harness a long some time, if ever // `http://localhost:5610/bundles/kbn-ui-shared-deps/${UiSharedDeps.lightCssDistFilename}`, ...DllCompiler.getRawDllConfig().chunks.map( - chunk => `http://localhost:5610/built_assets/dlls/vendors${chunk}.style.dll.css` + chunk => `http://localhost:5610/${buildNum}/built_assets/dlls/vendors${chunk}.style.dll.css` ), - 'http://localhost:5610/bundles/tests.style.css', + `http://localhost:5610/${buildNum}/bundles/tests.style.css`, ]; } @@ -128,9 +129,9 @@ module.exports = function(grunt) { proxies: { '/tests/': 'http://localhost:5610/tests/', - '/bundles/': 'http://localhost:5610/bundles/', - '/built_assets/dlls/': 'http://localhost:5610/built_assets/dlls/', '/test_bundle/': 'http://localhost:5610/test_bundle/', + [`/${buildNum}/bundles/`]: `http://localhost:5610/${buildNum}/bundles/`, + [`/${buildNum}/built_assets/dlls/`]: `http://localhost:5610/${buildNum}/built_assets/dlls/`, }, client: {