diff --git a/src/ru/pulsar/jenkins/library/steps/Bdd.groovy b/src/ru/pulsar/jenkins/library/steps/Bdd.groovy index 59d8652..379e7e4 100644 --- a/src/ru/pulsar/jenkins/library/steps/Bdd.groovy +++ b/src/ru/pulsar/jenkins/library/steps/Bdd.groovy @@ -39,7 +39,7 @@ class Bdd implements Serializable { def coverageOpts = config.coverageOptions; if (options.coverage) { - steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${PortPicker.port()}") + steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${PortPicker.getPort()}") steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $workspaceDir -s $srcDir -o build/out/bdd-coverage.xml") } diff --git a/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy b/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy index 61ccc57..9c8bb6a 100644 --- a/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy +++ b/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy @@ -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=${PortPicker.port()}") + steps.start("${coverageOpts.dbgsPath} --addr=127.0.0.1 --port=${PortPicker.getPort()}") steps.start("${coverageOpts.coverage41CPath} start -i DefAlias -u http://127.0.0.1:1550 -P $workspaceDir -s $srcDir -o build/out/smoketest-coverage.xml") } diff --git a/src/ru/pulsar/jenkins/library/utils/PortPicker.java b/src/ru/pulsar/jenkins/library/utils/PortPicker.java deleted file mode 100644 index ab6efb6..0000000 --- a/src/ru/pulsar/jenkins/library/utils/PortPicker.java +++ /dev/null @@ -1,14 +0,0 @@ -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; - } -}