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

simplify lock step

Browse Source
This commit is contained in:
Dima
2024-11-29 13:56:39 +03:00
parent 049951030e
commit a7b557e76a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ interface IStepExecutor {
def withEnv(List<String> strings, Closure body)
def lock(String label, int quantity, String resource, Closure<Object> body)
def lock(String resource, Closure<Object> body)
def archiveArtifacts(String path)

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

@@ -150,8 +150,8 @@ class StepExecutor implements IStepExecutor {
}
@Override
def lock(String label, int quantity, String resource, Closure body) {
steps.lock(label: label, quantity: quantity, resource: resource) {
def lock(String resource, Closure body) {
steps.lock(resource: resource) {
body()
}
}

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

@@ -53,7 +53,7 @@ class Bdd implements Serializable {
lockableResource = "${env.NODE_NAME}_$port"
}
steps.lock(null, 1, lockableResource) {
steps.lock(lockableResource) {
if (options.coverage) {
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=$port")
steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:$port -P $workspaceDir -s $srcDir -o $COVERAGE_STASH_PATH")

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

@@ -117,7 +117,7 @@ class SmokeTest implements Serializable {
lockableResource = "${env.NODE_NAME}_$port"
}
steps.lock(null, 1, lockableResource) {
steps.lock(lockableResource) {
if (options.coverage) {
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=$port")
steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:$port -P $workspaceDir -s $srcDir -o $COVERAGE_STASH_PATH")

2
src/ru/pulsar/jenkins/library/steps/Yaxunit.groovy
View File

@@ -80,7 +80,7 @@ class Yaxunit implements Serializable {
lockableResource = "${env.NODE_NAME}_$port"
}
steps.lock(null, 1, lockableResource) {
steps.lock(lockableResource) {
if (options.coverage) {
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=$port")
steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:$port -P $workspaceDir -s $srcDir -o $COVERAGE_STASH_PATH")