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

Browse Source
This commit is contained in:
Dima
2023-06-12 10:41:18 +03:00
parent 3c0bb34225
commit 271dbf75e2
3 changed files with 18 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

@@ -5,6 +5,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.FileUtils
import ru.pulsar.jenkins.library.utils.Logger
import ru.pulsar.jenkins.library.utils.PortPicker
import ru.pulsar.jenkins.library.utils.VRunner
class Bdd implements Serializable {
@@ -38,8 +39,7 @@ class Bdd implements Serializable {
def coverageOpts = config.coverageOptions;
if (options.coverage) {
ServerSocket s = new ServerSocket(0)
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${s.getLocalPort().toString()}")
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${PortPicker.port()}")
steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $workspaceDir -s $srcDir -o build/out/bdd-coverage.xml")
}

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

@@ -6,6 +6,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.FileUtils
import ru.pulsar.jenkins.library.utils.Logger
import ru.pulsar.jenkins.library.utils.PortPicker
import ru.pulsar.jenkins.library.utils.StringJoiner
import ru.pulsar.jenkins.library.utils.VRunner
@@ -105,8 +106,7 @@ class SmokeTest implements Serializable {
def coverageOpts = config.coverageOptions;
if (options.coverage) {
ServerSocket s = new ServerSocket(0)
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${s.getLocalPort().toString()}")
steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${PortPicker.port()}")
steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $workspaceDir -s $srcDir -o build/out/smoketest-coverage.xml")
}

14
src/ru/pulsar/jenkins/library/utils/PortPicker.java Normal file
View File

@@ -0,0 +1,14 @@
package ru.pulsar.jenkins.library.utils;
import com.cloudbees.groovy.cps.NonCPS;
import java.io.IOException;
import java.net.ServerSocket;
public class PortPicker {
@NonCPS
static int port() throws IOException {
int result = new ServerSocket(0).getLocalPort();
return result;
}
}