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

refactoring

Browse Source
This commit is contained in:
Dima
2024-11-30 13:49:31 +03:00
parent 77130fb70d
commit dcf3604576
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ru/pulsar/jenkins/library/configuration/StepCoverageOptions.groovy
View File

@@ -2,12 +2,12 @@ package ru.pulsar.jenkins.library.configuration
import com.fasterxml.jackson.annotation.JsonPropertyDescription import com.fasterxml.jackson.annotation.JsonPropertyDescription
class StepCoverageOptions { class StepCoverageOptions implements Serializable {
@JsonPropertyDescription("Выполнять замер покрытия") @JsonPropertyDescription("Выполнять замер покрытия")
Boolean coverage = false Boolean coverage = false
@JsonPropertyDescription("Порт, на котором будет запущен сервер отладки для замера покрытия") @JsonPropertyDescription("Порт, на котором будет запущен сервер отладки для замера покрытия")
int dbgsPort = 1550 Integer dbgsPort = 1550
} }

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

@@ -46,8 +46,8 @@ class Bdd implements Serializable, Coverable {
def coverageContext = CoverageUtils.prepareContext(config, options) def coverageContext = CoverageUtils.prepareContext(config, options)
steps.lock(coverageContext.lockableResource) { steps.lock(coverageContext.lockableResource) {
if (coverageContext != null) { if (options.coverage) {
CoverageUtils.startCoverage(steps, coverageOpts, coverageContext, workspaceDir, srcDir, this) CoverageContext.startCoverage(steps, coverageOpts, coverageContext, workspaceDir, srcDir, this)
} }
config.bddOptions.vrunnerSteps.each { config.bddOptions.vrunnerSteps.each {
@@ -65,7 +65,7 @@ class Bdd implements Serializable, Coverable {
Logger.println("Тестирование сценариев завершилось успешно") Logger.println("Тестирование сценариев завершилось успешно")
} }
if (coverageContext != null) { if (options.coverage) {
CoverageUtils.stopCoverage(steps, coverageOpts, coverageContext) CoverageUtils.stopCoverage(steps, coverageOpts, coverageContext)
} }
} }

13
src/ru/pulsar/jenkins/library/steps/CoverageCleanup.groovy
View File

@@ -22,7 +22,7 @@ class CoverageCleanup implements Serializable {
Logger.printLocation() Logger.printLocation()
String pidsFilePath = "build/$stageName-pids" String pidsFilePath = "build${File.separator}${stageName}-pids"
def pids = "" def pids = ""
if (steps.fileExists(pidsFilePath)) { if (steps.fileExists(pidsFilePath)) {
@@ -35,16 +35,15 @@ class CoverageCleanup implements Serializable {
} }
Logger.println("Завершение процессов dbgs и Coverage41C с pid: $pids") Logger.println("Завершение процессов dbgs и Coverage41C с pid: $pids")
def command
if (steps.isUnix()) { if (steps.isUnix()) {
def command = "kill $pids" command = "kill $pids"
steps.sh(command, true, false, encoding)
} else { } else {
def winCommand = pids.split(" ") def pidsForCmd = pids.split(" ")
.each { it -> "/PID $it" } .each { it -> "/PID $it" }
.join(" ") .join(" ")
def command = "taskkill $winCommand /F" command = "taskkill $pidsForCmd /F"
steps.sh(command, true, false, encoding)
} }
steps.cmd(command, true, false)
} }
} }

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

@@ -111,15 +111,15 @@ class SmokeTest implements Serializable, Coverable {
def coverageContext = CoverageUtils.prepareContext(config, options) def coverageContext = CoverageUtils.prepareContext(config, options)
steps.lock(coverageContext.lockableResource) { steps.lock(coverageContext.lockableResource) {
if (coverageContext != null) { if (options.coverage) {
CoverageUtils.startCoverage(steps, coverageOpts, coverageContext, workspaceDir, srcDir, this) CoverageContext.startCoverage(steps, coverageOpts, coverageContext, workspaceDir, srcDir, this)
} }
steps.withEnv(logosConfig) { steps.withEnv(logosConfig) {
VRunner.exec(command, true) VRunner.exec(command, true)
} }
if (coverageContext != null) { if (options.coverage) {
CoverageUtils.stopCoverage(steps, coverageOpts, coverageContext) CoverageUtils.stopCoverage(steps, coverageOpts, coverageContext)
} }
} }

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

@@ -73,8 +73,8 @@ class Yaxunit implements Serializable, Coverable {
def coverageContext = CoverageUtils.prepareContext(config, options) def coverageContext = CoverageUtils.prepareContext(config, options)
steps.lock(coverageContext.lockableResource) { steps.lock(coverageContext.lockableResource) {
if (coverageContext != null) { if (options.coverage) {
CoverageUtils.startCoverage(steps, coverageOpts, coverageContext, workspaceDir, srcDir, this) CoverageContext.startCoverage(steps, coverageOpts, coverageContext, workspaceDir, srcDir, this)
} }
// Выполняем команды // Выполняем команды
@@ -82,7 +82,7 @@ class Yaxunit implements Serializable, Coverable {
VRunner.exec(runTestsCommand, true) VRunner.exec(runTestsCommand, true)
} }
if (coverageContext != null) { if (options.coverage) {
CoverageUtils.stopCoverage(steps, coverageOpts, coverageContext) CoverageUtils.stopCoverage(steps, coverageOpts, coverageContext)
} }
} }