From 80084fdcf2ed11a4d0f0b5be02df59da32b1250e Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Fri, 17 Apr 2020 13:40:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20junit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/globalConfiguration.json | 2 +- vars/syntaxCheck.groovy | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/globalConfiguration.json b/resources/globalConfiguration.json index cbdf020..ca47ad6 100644 --- a/resources/globalConfiguration.json +++ b/resources/globalConfiguration.json @@ -13,7 +13,7 @@ "syntaxCheck": { "enabled": false, "groupErrorsByMetadata": true, - "pathToJUnitReport": "./build/out/jUnit/syntax.xml", + "pathToJUnitReport": "build/out/jUnit/syntax.xml", "checkModes": [ "-ThinClient", "-WebClient", diff --git a/vars/syntaxCheck.groovy b/vars/syntaxCheck.groovy index 1034b94..d6814a8 100644 --- a/vars/syntaxCheck.groovy +++ b/vars/syntaxCheck.groovy @@ -1,4 +1,3 @@ -import hudson.FilePath import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.ioc.ContextRegistry @@ -18,8 +17,8 @@ def call(JobConfiguration config) { unzipInfobase() - def junitPath = new FilePath(new File(options.pathToJUnitReport)) - junitPath.mkdirs() + def outPath = new File(options.pathToJUnitReport).getParent() + dir(outPath) { echo '' } String command = "oscript_modules/bin/vrunner syntax-check --ibconnection \"/F./build/ib\"" @@ -38,5 +37,5 @@ def call(JobConfiguration config) { junit allowEmptyResults: true, testResults: options.pathToJUnitReport - archiveArtifacts 'build/**/*.*' + archiveArtifacts 'build/**/*.*', excludes: '*.1CD' }