add lockable resources in bdd

src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy

@@ -82,7 +82,6 @@ class ConfigurationReader implements Serializable {
         mergeObjects(baseConfiguration, configurationToMerge, nonMergeableSettings)
         mergeInitInfoBaseOptions(baseConfiguration.initInfoBaseOptions, configurationToMerge.initInfoBaseOptions)
         mergeBddOptions(baseConfiguration.bddOptions, configurationToMerge.bddOptions)
-        mergeCoverageOptions(baseConfiguration.coverageOptions, configurationToMerge.coverageOptions)
         mergeSyntaxCheckOptions(baseConfiguration.syntaxCheckOptions, configurationToMerge.syntaxCheckOptions)
         mergeNotificationsOptions(baseConfiguration.notificationsOptions, configurationToMerge.notificationsOptions)
 
@@ -149,22 +148,6 @@ class ConfigurationReader implements Serializable {
         baseObject.vrunnerSteps = objectToMerge.vrunnerSteps.clone()
     }
 
-    @NonCPS
-    private static void mergeCoverageOptions(CoverageOptions baseObject, CoverageOptions objectToMerge) {
-
-        if (objectToMerge == null) {
-            return
-        }
-
-        if (objectToMerge.dbgsPath != null) {
-            baseObject.dbgsPath = objectToMerge.dbgsPath
-        }
-
-        if (objectToMerge.coverage41CPath != null) {
-            baseObject.coverage41CPath = objectToMerge.coverage41CPath
-        }
-    }
-
     @NonCPS
     private static void mergeSyntaxCheckOptions(SyntaxCheckOptions baseObject, SyntaxCheckOptions objectToMerge) {
         if (objectToMerge == null || objectToMerge.checkModes == null) {

src/ru/pulsar/jenkins/library/configuration/CoverageOptions.groovy

@@ -12,6 +12,11 @@ class CoverageOptions implements Serializable {
     ''')
     String dbgsPath
 
+    @JsonPropertyDescription('''Порт сервера отладки.
+    По умолчанию равен 1550.
+    ''')
+    int dbgsPort = 1550
+
     @JsonPropertyDescription('''Путь к исполняемому файлу Coverage41C
     По умолчанию равен Coverage41C.
     ''')
@@ -22,6 +27,7 @@ class CoverageOptions implements Serializable {
     String toString() {
         return "coverageOptions{" +
                 "dbgsPath=" + dbgsPath +
+                "dbgsPort=" + dbgsPort +
                 ", coverage41CPath=" + coverage41CPath +
                 '}'
     }

test/integration/groovy/jobConfigurationTest.groovy

@@ -75,6 +75,7 @@ class jobConfigurationTest {
         rule.assertLogContains("sonarScannerToolName='sonar-scanner'", run)
         rule.assertLogContains("initMethod=FROM_SOURCE", run)
         rule.assertLogContains("dbgsPath=C:\\Program files\\1cv8\\8.3.12.1500\\bin\\dbgs.exe", run)
+        rule.assertLogContains("dbgsPort=4543", run)
         rule.assertLogContains("coverage41CPath=C:\\coverage\\Coverage41C.exe", run)
     }
 }

test/integration/resources/jobConfiguration.json

@@ -13,6 +13,7 @@
   },
   "coverage": {
     "dbgsPath": "C:\\\\Program files\\\\1cv8\\\\8.3.12.1500\\\\bin\\\\dbgs.exe",
+    "dbgsPort": 4543,
     "coverage41CPath": "C:\\\\coverage\\\\Coverage41C.exe"
   }
 }