Исправление ошибки публикации по вложенным папкам в /build/out/allure

LICENSE.md

@@ -1,25 +1,25 @@
-The MIT License (MIT)
-=====================
-
-Copyright © `2020` `First Bit Semenovskaya, Первый Бит Семеновская`
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the “Software”), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+=====================
+
+Copyright © `2020` `First Bit Semenovskaya, Первый Бит Семеновская`
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

src/ru/pulsar/jenkins/library/steps/PublishAllure.groovy

@@ -17,11 +17,10 @@ class PublishAllure implements Serializable {
     }
 
     def run() {
-
         Logger.printLocation()
 
         if (config == null) {
-            Logger.println("jobConfiguration is not initialized")
+            Logger.println('jobConfiguration is not initialized')
             return
         }
 
@@ -44,16 +43,37 @@ class PublishAllure implements Serializable {
 
         FilePath allurePath = FileUtils.getFilePath("$env.WORKSPACE/build/out/allure")
         if (!allurePath.exists()) {
-            Logger.println("Отсутствуют результаты allure для публикации")
+            Logger.println('Отсутствуют результаты allure для публикации')
             return
         }
 
         List<String> results = new ArrayList<>()
 
+        int directoryCount = allurePath.listDirectories().size()
+        Logger.println("Log: Количество подкаталогов в $allurePath: $directoryCount")
+
+        FilePath workSpacePath = FileUtils.getFilePath("$env.WORKSPACE")
+        String basePath = replaceBackslashesWithSlashes(workSpacePath.toString())
+        Logger.println("Log: workSpacePath = $workSpacePath, basePath = $basePath")
+
         allurePath.listDirectories().each { FilePath filePath ->
-            results.add(FileUtils.getLocalPath(filePath))
+            FilePath pathCurrent = FileUtils.getFilePath("$filePath")
+            String pathdir = FileUtils.getLocalPath(pathCurrent)
+            Logger.println("Log: pathCurrent = $pathCurrent, pathdir = $pathdir")
+
+            String rezultPath = getRelativePath(pathdir, basePath)
+            Logger.println("Log: pathdir = $pathdir, basePath = $basePath. Результат через getRelativePath() = $rezultPath")
+            results.add(rezultPath)
+
+            //String pathdir = FileUtils.getLocalPath(filePath)
+            //results.add(FileUtils.getLocalPath(filePath))
+            //Logger.println("Log: Результат для добавления в allure getLocalPath($pathCurrent): $pathdir")
         }
+
+        String pathAllure = FileUtils.getLocalPath(allurePath)
+        Logger.println("Log: если в подкаталогах allure пусто, то будет добавлен только путь на основе getLocalPath($allurePath): $pathAllure")
         if (results.isEmpty()) {
+            Logger.println('Log: результат пустой и фиксиурем путь выше')
             results.add(FileUtils.getLocalPath(allurePath))
         }
 
@@ -67,4 +87,23 @@ class PublishAllure implements Serializable {
             Logger.println("Can't unstash $stashName")
         }
     }
+
+    private static replaceBackslashesWithSlashes(String path) {
+        return path.replace('\\', '/')
+    }
+
+    private static String getRelativePath(String absolutePath, String basePath) {
+        def normalizedAbsolutePath = new File(absolutePath).canonicalPath
+        def normalizedBasePath = new File(basePath).canonicalPath
+
+        def relativePath = normalizedAbsolutePath.replaceFirst(normalizedBasePath, '')
+
+        // Убираем начальный '/' если он есть
+        if (relativePath.startsWith('/')) {
+            relativePath = relativePath.substring(1)
+        }
+
+        return relativePath
+    }
+
 }

src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy

@@ -52,6 +52,7 @@ class SonarScanner implements Serializable {
             }
         } else (branchAnalysisConfiguration == BranchAnalysisConfiguration.AUTO) {
             // no-op
+            sonarCommand += ""
         }
 
         String projectVersion = computeProjectVersion()

src/ru/pulsar/jenkins/library/steps/Yaxunit.groovy

@@ -86,7 +86,8 @@ class Yaxunit implements Serializable, Coverable {
                 FilePath pathToAllureReport = FileUtils.getFilePath("$env.WORKSPACE/$allureReport")
                 String allureReportDir = FileUtils.getLocalPath(pathToAllureReport.getParent())
 
-                pathToJUnitReport.copyTo(pathToAllureReport)
+                // * Закомментировано, т.к. ошибка формирования отчета allure 
+                //pathToJUnitReport.copyTo(pathToAllureReport)
 
                 steps.stash(YAXUNIT_ALLURE_STASH, "$allureReportDir/**", true)
             }

src/ru/pulsar/jenkins/library/utils/FileUtils.groovy

@@ -35,11 +35,17 @@ class FileUtils {
         Path workspacePath = new File(env.WORKSPACE).toPath()
         Path rawFilePath = new File(filePath.getRemote()).toPath()
 
-        return workspacePath.relativize(rawFilePath)
+        def str = workspacePath.relativize(rawFilePath)
             .toString()
             .replaceAll('\\\\\\\\', '/')
             .replaceAll('\\\\', '/')
             .toString()
+
+        if (str.startsWith("../")) {
+            str = str.substring(3)
+            }
+
+        return str
     }
 
     static void loadFile(String filePathFrom, def env, String filePathTo) {