diff --git a/src/ru/pulsar/jenkins/library/steps/Bdd.groovy b/src/ru/pulsar/jenkins/library/steps/Bdd.groovy index 5993cb5..4e93d61 100644 --- a/src/ru/pulsar/jenkins/library/steps/Bdd.groovy +++ b/src/ru/pulsar/jenkins/library/steps/Bdd.groovy @@ -29,7 +29,7 @@ class Bdd implements Serializable { def options = config.bddOptions def env = steps.env(); def srcDir = config.srcDir - FilePath projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") + def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE") List logosConfig = ["LOGOS_CONFIG=$config.logosConfig"] steps.withEnv(logosConfig) { @@ -40,7 +40,7 @@ class Bdd implements Serializable { def coverageOpts = config.coverageOptions; if (options.coverage) { steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=1550") - steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $projectDir -s $srcDir -o build/out/bdd-coverage.xml") + steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $workspaceDir -s $srcDir -o build/out/bdd-coverage.xml") } config.bddOptions.vrunnerSteps.each { diff --git a/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy b/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy index 0463e85..2d100ec 100644 --- a/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy +++ b/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy @@ -38,7 +38,7 @@ class SmokeTest implements Serializable { def env = steps.env() def srcDir = config.srcDir - FilePath projectDir = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") + def workspaceDir = FileUtils.getFilePath("$env.WORKSPACE/$WORKSPACE") String vrunnerPath = VRunner.getVRunnerPath() String command = "$vrunnerPath xunit --ibconnection \"/F./build/ib\"" @@ -106,7 +106,7 @@ class SmokeTest implements Serializable { def coverageOpts = config.coverageOptions; if (options.coverage) { steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=1550") - steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $projectDir -s $srcDir -o build/out/smoketest-coverage.xml") + steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $workspaceDir -s $srcDir -o build/out/smoketest-coverage.xml") } steps.withEnv(logosConfig) {