mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
* Call failure reporter directly from Jenkinsfile (#45551)
* Run failed_tests/cli once per node
* force failures for testing
* Revert "force failures for testing"
This reverts commit 3ddd9240fe
.
# Conflicts:
# test/scripts/jenkins_firefox_smoke.sh
# test/scripts/jenkins_visual_regression.sh
# test/scripts/jenkins_xpack_firefox_smoke.sh
# test/scripts/jenkins_xpack_visual_regression.sh
* set NODE_OPTIONS for build
This commit is contained in:
parent
e7467e5856
commit
c63826374b
7 changed files with 34 additions and 15 deletions
16
Jenkinsfile
vendored
16
Jenkinsfile
vendored
|
@ -79,6 +79,10 @@ def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
|
|||
catchError {
|
||||
publishJunit()
|
||||
}
|
||||
|
||||
catchError {
|
||||
runErrorReporter()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -143,6 +147,9 @@ def legacyJobRunner(name) {
|
|||
catchError {
|
||||
publishJunit()
|
||||
}
|
||||
catchError {
|
||||
runErrorReporter()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -247,7 +254,7 @@ def runbld(script) {
|
|||
}
|
||||
|
||||
def bash(script) {
|
||||
sh "#!/bin/bash -x\n${script}"
|
||||
sh "#!/bin/bash\n${script}"
|
||||
}
|
||||
|
||||
def doSetup() {
|
||||
|
@ -261,3 +268,10 @@ def buildOss() {
|
|||
def buildXpack() {
|
||||
runbld "./test/scripts/jenkins_xpack_build_kibana.sh"
|
||||
}
|
||||
|
||||
def runErrorReporter() {
|
||||
bash """
|
||||
source src/dev/ci_setup/setup_env.sh
|
||||
node src/dev/failed_tests/cli
|
||||
"""
|
||||
}
|
||||
|
|
|
@ -47,7 +47,8 @@ export const OptimizeBuildTask = {
|
|||
await exec(log, kibanaScript, kibanaArgs, {
|
||||
cwd: build.resolvePath('.'),
|
||||
env: {
|
||||
FORCE_DLL_CREATION: 'true'
|
||||
FORCE_DLL_CREATION: 'true',
|
||||
NODE_OPTIONS: '--max-old-space-size=3072',
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
@ -23,19 +23,15 @@ const { resolve } = require('path');
|
|||
process.chdir(resolve(__dirname, '../../..'));
|
||||
|
||||
// JOB_NAME is formatted as `elastic+kibana+7.x` in some places and `elastic+kibana+7.x/JOB=kibana-intake,node=immutable` in others
|
||||
|
||||
const jobNameSplit = (process.env.JOB_NAME || '').split(/\+|\//);
|
||||
const branch = jobNameSplit.length >= 3 ? jobNameSplit[2] : process.env.GIT_BRANCH;
|
||||
|
||||
const isPr = !!process.env.ghprbPullId;
|
||||
|
||||
if (!branch) {
|
||||
console.log('Unable to determine originating branch from job name or other environment variables');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const isPr = !!process.env.ghprbPullId;
|
||||
const isMasterOrVersion = branch.match(/^(origin\/){0,1}master$/) || branch.match(/^(origin\/){0,1}\d+\.(x|\d+)$/);
|
||||
|
||||
if (!isMasterOrVersion || isPr) {
|
||||
console.log('Failure issues only created on master/version branch jobs');
|
||||
process.exit(0);
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
|
||||
if [[ "$IS_PIPELINE_JOB" ]] ; then
|
||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
else
|
||||
source src/dev/ci_setup/setup_env.sh
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
|
||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
fi
|
||||
|
||||
export TEST_BROWSER_HEADLESS=1
|
||||
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
|
||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
fi
|
||||
|
||||
export TEST_BROWSER_HEADLESS=1
|
||||
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
|
||||
export TEST_BROWSER_HEADLESS=1
|
||||
|
||||
if [[ "$IS_PIPELINE_JOB" ]] ; then
|
||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
||||
trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
||||
else
|
||||
source src/dev/ci_setup/setup_env.sh
|
||||
fi
|
||||
|
||||
export TEST_BROWSER_HEADLESS=1
|
||||
|
||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
||||
echo " -> Ensuring all functional tests are in a ciGroup"
|
||||
cd "$XPACK_DIR"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue