X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-defaults.yaml;h=6a1501100644d68aa24672ae870df7b48fb04749;hb=96b8f2ce95dfae2d14ad05616c76601b0b2949db;hp=d879661c5420bd9d4bc3524190431a89659e57c0;hpb=f85c92920e00ce776ed25e70f1cd87678f2f02ab;p=ci-management.git

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index d879661c5..6a1501100 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -4,6 +4,7 @@
 - defaults:
     name: global
 
+    # General job settings
     build-days-to-keep: 30
     # the below discarder values are hard coded into the macro and are only here
     # for documentation purposes
@@ -11,6 +12,7 @@
     build-artifact-days-to-keep: -1
     build-artifact-num-to-keep: 5
 
+    # Email preferences
     failure-notification: "releng+onap@linuxfoundation.org"
     failure-notification-prefix: "[releng]"
 
@@ -21,49 +23,52 @@
     packer-version: 1.3.1
 
     # default gerrit server definition
-    server-name: 'Primary'
-    gerrit-server-name: 'Primary'
+    server-name: "Primary"
+    gerrit-server-name: "Primary"
 
     # Java
-    jdk: ''
+    jdk: ""
 
     # Maven
-    mvn-params: ''
-    mvn-staging-id: 'ecomp-staging'
+    mvn-params: ""
+    mvn-staging-id: "ecomp-staging"
     onap-infra-mvn-opts: |
-        --show-version
-        --batch-mode
-        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-        -Djenkins
-        -Dmaven.repo.local=/tmp/r
-        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+      --show-version
+      --batch-mode
+      -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      -Djenkins
+      -Dmaven.repo.local=/tmp/r
+      -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
     staging-profile-id: 176c31dfe190a
-
     # Timeout in minutes
     build-timeout: 90
+
+    # Default node, if not defined in the job
     build-node: ubuntu1804-builder-4c-4g
 
-    archive-artifacts: ''
+    archive-artifacts: ""
+
+    # Default branch value
+    branch: master
 
     # Set default maven version used for everything
-    maven-version: 'mvn33'
+    maven-version: "mvn33"
 
     # git submodule attributes
     submodule-recursive: true
     submodule-disable: false
 
     # Jenkins
-    jenkins-ssh-credential: 'onap-jenkins-ssh'
-    jenkins-ssh-release-credential: 'jenkins-release'
+    jenkins-ssh-credential: "onap-jenkins-ssh"
+    jenkins-ssh-release-credential: "jenkins-release"
 
     # SonarCloud
     sonarcloud_project_organization: onap
-    sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff
-    sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:4.6.0.2311:sonar"
+    sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar"
 
     # Nexus3 docker registries
     container-public-registry: nexus3.onap.org:10001
     container-snapshot-registry: nexus3.onap.org:10003
     container-staging-registry: nexus3.onap.org:10004
     # the quotes here are REQUIRED
-    container-push-registry: '{container-snapshot-registry}'
+    container-push-registry: "{container-snapshot-registry}"