From 38fb51b74b068d9e05aff0f524a8e166ed60f387 Mon Sep 17 00:00:00 2001
From: Ramzi El-Yafi <ramzi.el-yafi@r3.com>
Date: Tue, 14 Jan 2020 11:10:42 +0000
Subject: [PATCH] Strategic fix for allure report generation memory issues
 (#5845)

---
 .ci/dev/regression/Jenkinsfile | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
index 99aa0d1a64..a4017c5c86 100644
--- a/.ci/dev/regression/Jenkinsfile
+++ b/.ci/dev/regression/Jenkinsfile
@@ -65,22 +65,13 @@ pipeline {
                      * copied to avoid collisions between files where the same test
                      * classes have run on multiple pods.
                      */
-                    sh label: 'Compact test results',
-                       script:
-                           '''#!/bin/bash
-                              shopt -s globstar
-                              rm -rf allure-input
-                              mkdir allure-input
-
-                              for i in **/test-results-xml/**/test-runs/test-reports/**
-                              do
-                                  [ -f $i ] &&
-                                  cp $i allure-input/$(echo $i | sed -e \\
-                                      \'s/.*test-results-xml\\/.*-\\(.*\\)\\/test-runs\\/.*\\/\\(.*\\)$/\\1\\-\\2/\')
-                              done
-
-                              echo "Finished compacting JUnit results"
-                       '''
+                    fileOperations([fileCopyOperation(
+                            includes: '**/test-results-xml/**/test-runs/test-reports/**',
+                            targetLocation: 'allure-input',
+                            flattenFiles: true,
+                            renameFiles: true,
+                            sourceCaptureExpression: '.*test-results-xml/.*-([\\d]+)/.*/([^/]+)$',
+                            targetNameExpression: '$1-$2')])
                     allure includeProperties: false,
                            jdk: '',
                            results: [[path: '**/allure-input']]