From b3ace45d3abc17f857c671a7a3bcd37ae0dabebc Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 15 Apr 2020 18:24:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=85=D0=B5=D0=BC=D0=B0=20=D0=B8=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=BD=D0=B5=D0=B2=D0=B0=D1=8F=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/globalConfiguration.json |  9 +++++++--
 resources/schema.json              | 27 +++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/resources/globalConfiguration.json b/resources/globalConfiguration.json
index 4adbab2..b185a0f 100644
--- a/resources/globalConfiguration.json
+++ b/resources/globalConfiguration.json
@@ -1,8 +1,13 @@
 {
   "$schema": "schema.json",
-  "sonarScannerToolName": "sonar-scanner",
   "secrets": {
     "storagePath": "UNKNOWN_ID",
     "storage": "UNKNOWN_ID"
+  },
+  "sonarqube": {
+    "enabled": false,
+    "sonarQubeInstallation": "",
+    "useSonarScannerFromPath": true,
+    "sonarScannerToolName": "sonar-scanner"
   }
-}
\ No newline at end of file
+}
diff --git a/resources/schema.json b/resources/schema.json
index 96c2944..370fa8b 100644
--- a/resources/schema.json
+++ b/resources/schema.json
@@ -6,10 +6,6 @@
       "type" : "string",
       "description" : "Версия платформы 1С:Предприятие в формате 8.3.хх.хххх."
     },
-    "sonarScannerToolName" : {
-      "type" : "string",
-      "description" : "Имя настроенной утилиты sonar-scanner."
-    },
     "secrets" : {
       "type" : "object",
       "id" : "urn:jsonschema:ru:pulsar:jenkins:library:configuration:Secrets",
@@ -24,6 +20,29 @@
           "description" : "Данные авторизации в хранилище конфигурации"
         }
       }
+    },
+    "sonarqube" : {
+      "type" : "object",
+      "id" : "urn:jsonschema:ru:pulsar:jenkins:library:configuration:SonarQubeOptions",
+      "description" : "Настройки анализа SonarQube",
+      "properties" : {
+        "enabled" : {
+          "type" : "boolean",
+          "description" : "Анализ SonarQube включен"
+        },
+        "sonarQubeInstallation" : {
+          "type" : "string",
+          "description" : "Имя настроенного SonarQube-сервера (SonarQube installations).\nЕсли настроен только один сервер, то может быть оставлено пустым."
+        },
+        "useSonarScannerFromPath" : {
+          "type" : "boolean",
+          "description" : "Использовать sonar-scanner, доступный в PATH"
+        },
+        "sonarScannerToolName" : {
+          "type" : "string",
+          "description" : "Имя настроенной утилиты sonar-scanner.\nПрименяется, если useSonarScannerFromPath установлено в false."
+        }
+      }
     }
   }
 }
\ No newline at end of file