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