From 7312b7e75a41f18756eddef96b78959e7001a6d5 Mon Sep 17 00:00:00 2001
From: ivanovEV <ivanovev@melonfashion.com>
Date: Fri, 8 Apr 2022 15:05:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20useBranchPlu?=
 =?UTF-8?q?gin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/globalConfiguration.json                          | 3 ++-
 resources/schema.json                                       | 4 ++++
 .../jenkins/library/configuration/SonarQubeOptions.groovy   | 4 ++++
 src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy     | 6 +++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/globalConfiguration.json b/resources/globalConfiguration.json
index 7ed9f03..b68db16 100644
--- a/resources/globalConfiguration.json
+++ b/resources/globalConfiguration.json
@@ -43,7 +43,8 @@
     "sonarQubeInstallation": "",
     "useSonarScannerFromPath": true,
     "sonarScannerToolName": "sonar-scanner",
-    "infoBaseUpdateModuleName" : ""
+    "infoBaseUpdateModuleName" : "",
+    "useBranchPlugin" : true
   },
   "syntaxCheck": {
     "groupErrorsByMetadata": true,
diff --git a/resources/schema.json b/resources/schema.json
index 5d2c076..f94f575 100644
--- a/resources/schema.json
+++ b/resources/schema.json
@@ -173,6 +173,10 @@
         "infoBaseUpdateModuleName" : {
           "type" : "string",
           "description" : "Имя общего модуля (например, ОбновлениеИнформационнойБазыXXX), в котором указана версия библиотеки.\n    Версия должна задаваться в виде присвоения `Описание.Версия = \"ваш номер версии\";`\n    "
+        },
+        "useBranchPlugin" : {
+          "type" : "boolean",
+          "description" : "Используется ли Branch-plugin в SonarQube"
         }
       }
     },
diff --git a/src/ru/pulsar/jenkins/library/configuration/SonarQubeOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/SonarQubeOptions.groovy
index dad4964..7c2c3a5 100644
--- a/src/ru/pulsar/jenkins/library/configuration/SonarQubeOptions.groovy
+++ b/src/ru/pulsar/jenkins/library/configuration/SonarQubeOptions.groovy
@@ -25,6 +25,9 @@ class SonarQubeOptions implements Serializable {
     """)
     String infoBaseUpdateModuleName
 
+    @JsonPropertyDescription("Используется ли Branch-plugin в SonarQube")
+    Boolean useBranchPlugin
+
     @Override
     @NonCPS
     String toString() {
@@ -33,6 +36,7 @@ class SonarQubeOptions implements Serializable {
             ", sonarScannerToolName='" + sonarScannerToolName + '\'' +
             ", sonarQubeInstallation='" + sonarQubeInstallation + '\'' +
             ", infoBaseUpdateModuleName='" + infoBaseUpdateModuleName + '\'' +
+            ", useBranchPlugin='" + useBranchPlugin + '\'' +
             '}';
     }
 }
diff --git a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
index 022e187..b1a4348 100644
--- a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
@@ -36,7 +36,11 @@ class SonarScanner implements Serializable {
             sonarScannerBinary = "$scannerHome/bin/sonar-scanner"
         }
 
-        String sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME"
+        String sonarCommand = "$sonarScannerBinary"
+
+        if (config.sonarQubeOptions.useBranchPlugin) {
+            sonarCommand += " -Dsonar.branch.name=$env.BRANCH_NAME"
+        }
 
         String projectVersion = computeProjectVersion()
         if (projectVersion) {