[JENKINS-49269] Fix jenkinsfile and use latest commit of ath

jenkinsci · Mar 14, 2018 · 122ce9a · 122ce9a
1 parent bdf82bc
commit 122ce9a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -43,8 +43,6 @@ for(i = 0; i < buildTypes.size(); i++) {
                             if(isUnix()) {
                                 sh mvnCmd
                                 sh 'test `git status --short | tee /dev/stderr | wc --bytes` -eq 0'
-                                // Stash for ATH run
-                                stash name: "metadata", includes: "essentials.yml"
                             } else {
                                 bat mvnCmd
                             }
@@ -68,21 +66,27 @@ for(i = 0; i < buildTypes.size(); i++) {
     }
 }
 
-builds.failFast = failFast
-parallel builds
-
-if (buildTypes.contains("linux")) {
+builds.ath = {
     node("linux") {
-        unstash "metadata"
-        unarchive mapping: ['war/target/linux-jenkins.war': 'jenkins.war']
-        def fileUrl = "file://" + pwd() + "/jenkins.war"
-        def metadataPath = pwd() + "/essentials.yml"
+        def fileUri
+        def metadataPath
+        dir("sources") {
+            checkout scm
+            sh "mvn -DskipTests -am -pl war package -Dmaven.repo.local=${pwd tmp: true}/m2repo -s settings-azure.xml"
+            dir("war/target") {
+                fileUri = "file://" + pwd() + "/jenkins.war"
+            }
+            metadataPath = pwd() + "/essentials.yml"
+        }
         dir("ath") {
-            runATH(jenkins: fileUrl, metadataFile: metadataPath)
+            runATH jenkins: fileUri, metadataFile: metadataPath
         }
     }
 }
 
+builds.failFast = failFast
+parallel builds
+
 // This method sets up the Maven and JDK tools, puts them in the environment along
 // with whatever other arbitrary environment variables we passed in, and runs the
 // body we passed in within that environment.

diff --git a/essentials.yml b/essentials.yml
@@ -1,4 +1,4 @@
 ---
 ath:
   useLocalSnapshots: false
-  athRevision: "b36f2d27fdaa3f7ce73f0179ddbd26a6d7fa05fc"
+  athRevision: "06caf67d37d945ec5228a80d73714fac692c28d3"