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 start step

Browse Source
This commit is contained in:
Dima
2024-12-12 09:15:23 +03:00
parent 7f4b7fae69
commit bbd5238277
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/pulsar/jenkins/library/IStepExecutor.groovy
View File

@@ -44,7 +44,7 @@ interface IStepExecutor {
def ringCommand(String script) def ringCommand(String script)
void start(String script) void start(String executable, String params)
void tool(String toolName) void tool(String toolName)

4
src/ru/pulsar/jenkins/library/StepExecutor.groovy
View File

@@ -76,8 +76,8 @@ class StepExecutor implements IStepExecutor {
} }
@Override @Override
void start(String script) { void start(String executable, String params) {
steps.start(script) steps.start(executable, params)
} }
@Override @Override

12
src/ru/pulsar/jenkins/library/steps/Start.groovy
View File

@@ -5,20 +5,22 @@ import ru.pulsar.jenkins.library.ioc.ContextRegistry
class Start implements Serializable { class Start implements Serializable {
private String script private String executable
private String params
private String encoding = 'UTF-8' private String encoding = 'UTF-8'
Start(String script) { Start(String executable, String params) {
this.script = script this.executable = executable
this.params = params
}; };
void run() { void run() {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor() IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
if (steps.isUnix()) { if (steps.isUnix()) {
steps.sh("$script &", false, false , encoding) steps.sh("$executable $params &", false, false , encoding)
} else { } else {
steps.bat("chcp 65001 > nul \nstart $script", false, false, encoding) steps.bat("chcp 65001 > nul \nstart \"\" /B \"$executable\" \"$params\"", false, false, encoding)
} }
} }
} }

4
src/ru/pulsar/jenkins/library/utils/CoverageUtils.groovy
View File

@@ -51,8 +51,8 @@ class CoverageUtils {
String dbgsPath = findDbgs(steps, config) String dbgsPath = findDbgs(steps, config)
steps.start("${dbgsPath} --addr=127.0.0.1 --port=${coverageContext.port}") steps.start(dbgsPath, "--addr=127.0.0.1 --port=${coverageContext.port}")
steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:${coverageContext.port} -P $workspaceDir -s $srcDir -o ${stage.getCoverageStashPath()}") steps.start(coverageOpts.coverage41CPath, "start -i DefAlias -u http://127.0.0.1:${coverageContext.port} -P $workspaceDir -s $srcDir -o ${stage.getCoverageStashPath()}")
steps.cmd("${coverageOpts.coverage41CPath} check -i DefAlias -u http://127.0.0.1:${coverageContext.port}") steps.cmd("${coverageOpts.coverage41CPath} check -i DefAlias -u http://127.0.0.1:${coverageContext.port}")
def newDbgsPids = getPIDs("dbgs") def newDbgsPids = getPIDs("dbgs")

4
vars/start.groovy
View File

@@ -1,9 +1,9 @@
import ru.pulsar.jenkins.library.steps.Start import ru.pulsar.jenkins.library.steps.Start
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
void call(String script) { void call(String executable, String params) {
ContextRegistry.registerDefaultContext(this) ContextRegistry.registerDefaultContext(this)
Start start = new Start(script) Start start = new Start(executable, params)
start.run() start.run()
} }