jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

fix paths

Browse Source
This commit is contained in:
Dima
2023-06-03 14:37:31 +03:00
parent 4930715ec7
commit 87cbb2c16c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ru/pulsar/jenkins/library/steps/Bdd.groovy
View File

@@ -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<String> 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 {

4
src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy
View File

@@ -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) {