Skip to content

Commit ae6f0fa

Browse files
Spencerspalgerelasticmachine
authored
[7.x] remove visual aspects of baseline job (#77815) (#77842)
Co-authored-by: spalger <[email protected]> Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: spalger <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
1 parent 52e78e2 commit ae6f0fa

File tree

5 files changed

+13
-29
lines changed

5 files changed

+13
-29
lines changed

.ci/Jenkinsfile_baseline_capture

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ kibanaPipeline(timeoutMinutes: 120) {
1111
'CI_PARALLEL_PROCESS_NUMBER=1'
1212
]) {
1313
parallel([
14-
'oss-visualRegression': {
15-
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
16-
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
14+
'oss-baseline': {
15+
workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
16+
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
1717
}
1818
},
19-
'xpack-visualRegression': {
20-
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
21-
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
19+
'xpack-baseline': {
20+
workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
21+
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
2222
}
2323
},
2424
])

test/scripts/jenkins_visual_regression.sh renamed to test/scripts/jenkins_baseline.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,3 @@ linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
99
installDir="$PARENT_DIR/install/kibana"
1010
mkdir -p "$installDir"
1111
tar -xzf "$linuxBuild" -C "$installDir" --strip=1
12-
13-
echo " -> running visual regression tests from kibana directory"
14-
yarn percy exec -t 10000 -- -- \
15-
node scripts/functional_tests \
16-
--debug --bail \
17-
--kibana-install-dir "$installDir" \
18-
--config test/visual_regression/config.ts;

test/scripts/jenkins_xpack_visual_regression.sh renamed to test/scripts/jenkins_xpack_baseline.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,5 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
1414
mkdir -p "$WORKSPACE/kibana-build-xpack"
1515
cp -pR install/kibana/. $WORKSPACE/kibana-build-xpack/
1616

17-
# cd "$KIBANA_DIR"
18-
# source "test/scripts/jenkins_xpack_page_load_metrics.sh"
19-
2017
cd "$KIBANA_DIR"
2118
source "test/scripts/jenkins_xpack_saved_objects_field_metrics.sh"
22-
23-
echo " -> running visual regression tests from x-pack directory"
24-
cd "$XPACK_DIR"
25-
yarn percy exec -t 10000 -- -- \
26-
node scripts/functional_tests \
27-
--debug --bail \
28-
--kibana-install-dir "$installDir" \
29-
--config test/visual_regression/config.ts;

vars/kibanaPipeline.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
def withPostBuildReporting(Closure closure) {
1+
def withPostBuildReporting(Map params, Closure closure) {
22
try {
33
closure()
44
} finally {
@@ -9,8 +9,10 @@ def withPostBuildReporting(Closure closure) {
99
print ex
1010
}
1111

12-
catchErrors {
13-
runErrorReporter([pwd()] + parallelWorkspaces)
12+
if (params.runErrorReporter) {
13+
catchErrors {
14+
runErrorReporter([pwd()] + parallelWorkspaces)
15+
}
1416
}
1517

1618
catchErrors {

vars/workers.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ def base(Map params, Closure closure) {
118118

119119
// Worker for ci processes. Extends the base worker and adds GCS artifact upload, error reporting, junit processing
120120
def ci(Map params, Closure closure) {
121-
def config = [ramDisk: true, bootstrapped: true] + params
121+
def config = [ramDisk: true, bootstrapped: true, runErrorReporter: true] + params
122122

123123
return base(config) {
124124
kibanaPipeline.withGcsArtifactUpload(config.name) {
125-
kibanaPipeline.withPostBuildReporting {
125+
kibanaPipeline.withPostBuildReporting(config) {
126126
closure()
127127
}
128128
}

0 commit comments

Comments
 (0)