github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

increment leadfoot server port for parallel workers

Browse source
This commit is contained in:
spalger 2019-09-12 18:51:58 -07:00
parent b2d4335db9
commit a7352489e7
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -87,7 +87,7 @@ def getPostBuildWorker(name, closure) {
def esTransportPort = "61${workerNumber}3"
withEnv([
"CI_WORKER_NUMBER=${workerNumber}",
"PARALLEL_PIPELINE_WORKER_INDEX=${workerNumber}",
"TEST_KIBANA_HOST=localhost",
"TEST_KIBANA_PORT=${kibanaPort}",
"TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",

9
test/functional/services/remote/remote.js
View file

@ -31,7 +31,14 @@ export async function RemoteProvider({ getService }) {
throw new Error(`Unexpected TEST_BROWSER_TYPE "${browserType}". Valid options are ` + possibleBrowsers.join(','));
}
const browserDriverApi = await BrowserDriverApi.factory(log, config.get(browserType + 'driver.url'), browserType);
let browserDriverUrl = config.get(browserType + 'driver.url');
if (process.env.PARALLEL_PIPELINE_WORKER_INDEX) {
const parsedUrl = new URL(browserDriverUrl);
parsedUrl.port = `4444${process.env.PARALLEL_PIPELINE_WORKER_INDEX}`;
browserDriverUrl = parsedUrl.href;
}
const browserDriverApi = await BrowserDriverApi.factory(log, browserDriverUrl, browserType);
lifecycle.on('cleanup', async () => await browserDriverApi.stop());
await browserDriverApi.start();

2
test/scripts/jenkins_ci_group.sh
View file

@ -14,7 +14,7 @@ if [[ -z "$IS_PIPELINE_JOB" ]] ; then
node scripts/build --debug --oss;
else
installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
destDir=${installDir}-${CI_WORKER_NUMBER}
destDir=${installDir}-${PARALLEL_PIPELINE_WORKER_INDEX}
cp -R "$installDir" "$destDir"
export KIBANA_INSTALL_DIR="$destDir"

2
test/scripts/jenkins_xpack_ci_group.sh
View file

@ -36,7 +36,7 @@ if [[ -z "$IS_PIPELINE_JOB" ]] ; then
export KIBANA_INSTALL_DIR="$installDir"
else
installDir="$PARENT_DIR/install/kibana"
destDir="${installDir}-${CI_WORKER_NUMBER}"
destDir="${installDir}-${PARALLEL_PIPELINE_WORKER_INDEX}"
cp -R "$installDir" "$destDir"
export KIBANA_INSTALL_DIR="$destDir"