From 2179e031428b013578f0d04e66304ff2b6e7c47f Mon Sep 17 00:00:00 2001
From: Anton Kasperovich <iniwebaka@gmail.com>
Date: Fri, 22 Apr 2016 12:36:34 +0300
Subject: [PATCH] Added support of copying artifacts from Unit_Tests job with
 generated JaCoCo report to Code_Analysis job Changed sonar.sources by default
 to read only source code without tests

---
 jenkins/jobs/dsl/java_reference_application_jobs.groovy      | 5 +++--
 .../cartridge/CodeAnalysisReferenceApplicationJobSpec.groovy | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jenkins/jobs/dsl/java_reference_application_jobs.groovy b/jenkins/jobs/dsl/java_reference_application_jobs.groovy
index e39fc0a..0e514ab 100644
--- a/jenkins/jobs/dsl/java_reference_application_jobs.groovy
+++ b/jenkins/jobs/dsl/java_reference_application_jobs.groovy
@@ -113,6 +113,7 @@ unitTestJob.with {
         }
     }
     publishers {
+        archiveArtifacts("**/*")
         downstreamParameterized {
             trigger(projectFolderName + "/Reference_Application_Code_Analysis") {
                 condition("UNSTABLE_OR_BETTER")
@@ -144,7 +145,7 @@ codeAnalysisJob.with {
     }
     label("java8")
     steps {
-        copyArtifacts('Reference_Application_Build') {
+        copyArtifacts('Reference_Application_Unit_Tests') {
             buildSelector {
                 buildNumber('${B}')
             }
@@ -156,7 +157,7 @@ codeAnalysisJob.with {
             properties('''sonar.projectKey=${PROJECT_NAME_KEY}
 sonar.projectName=${PROJECT_NAME}
 sonar.projectVersion=1.0.${B}
-sonar.sources=src
+sonar.sources=src/main/java
 sonar.language=java
 sonar.sourceEncoding=UTF-8
 sonar.scm.enabled=false''')
diff --git a/src/test/groovy/com/java/cartridge/CodeAnalysisReferenceApplicationJobSpec.groovy b/src/test/groovy/com/java/cartridge/CodeAnalysisReferenceApplicationJobSpec.groovy
index ff6bcd9..44dd5b9 100644
--- a/src/test/groovy/com/java/cartridge/CodeAnalysisReferenceApplicationJobSpec.groovy
+++ b/src/test/groovy/com/java/cartridge/CodeAnalysisReferenceApplicationJobSpec.groovy
@@ -192,7 +192,7 @@ class CodeAnalysisReferenceApplicationJobSpec extends Specification {
             }
 
         where:
-            jenkinsJobName = 'Reference_Application_Build'
+            jenkinsJobName = 'Reference_Application_Unit_Tests'
     }
 
     def 'step SonarQube configuration block exists'() {
@@ -221,7 +221,7 @@ class CodeAnalysisReferenceApplicationJobSpec extends Specification {
                     text() == 'sonar.projectKey=${PROJECT_NAME_KEY}' + "\n" +
                         'sonar.projectName=${PROJECT_NAME}' + "\n" +
                         'sonar.projectVersion=1.0.${B}' + "\n" +
-                        "sonar.sources=src\n" +
+                        "sonar.sources=src/main/java\n" +
                         "sonar.language=java\n" +
                         "sonar.sourceEncoding=UTF-8\n" +
                         "sonar.scm.enabled=false"