From 532a645cee7996d707de237031c81cb8a7a8f4aa Mon Sep 17 00:00:00 2001
From: Catalin Scrieciu <catalin.scrieciu@enea.com>
Date: Fri, 15 Jul 2016 15:17:34 +0200
Subject: test

---
 Jenkinsfile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'Jenkinsfile')

diff --git a/Jenkinsfile b/Jenkinsfile
index f4de611..8c13ff1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,14 +22,10 @@ def getReleaseLayer(){
     return targetList
 }
 
-def imageBuild(){
-    print 'test'
-}
-
-def imageBuild(machine, profile, buildStamp, releaseLayer){
+def imageBuild(imageType, machine, profile, buildStamp, releaseLayer){
    {
        it-> node{
-	    print 'Starting build for each image type'
+	    print 'Starting build for each image type '+imageType
 	    print machine
 	    print profile
 	    print buildStamp
@@ -38,7 +34,7 @@ def imageBuild(machine, profile, buildStamp, releaseLayer){
    }
 }
 
-def targetBuild(trg){
+def targetBuild(trg, images_to_buid, profile, buildStamp, releaseLayer){
     {
        target=trg-> node{
             //sh 'mkdir ${trg}'
@@ -64,13 +60,14 @@ def targetBuild(trg){
                     userRemoteConfigs: [[credentialsId: 'a797f854-983e-473e-b221-6d8ebafda16a', 
                     url: 'git@git.enea.se:linux/meta-enea-test.git']]])
 		print 'Finished cloing meta-enea-test'
+		pwd()
 		stash includes: 'poky/*', name: trg+'_poky', useDefaultExcludes: false
             }
         }
 	def buildImageMap = [:]
 	for (image in images_to_buid){
     	    def imageId = image+'_build'
-    	    buildImageMap[imageId] = imageBuild(imageId)
+    	    buildImageMap[imageId] = imageBuild(imageId, trg, profile, buildStamp, releaseLayer)
 	}
 	parallel buildImageMap
     }
@@ -119,7 +116,7 @@ node {
     // Determine needed information like the EL Profile or the release layer to be used later as environment variables
     profile = getProfile()
     releaseLayer = getReleaseLayer()
-    buildStamp = env.BUILD_ID
+    buildStamp = env.BUILD_TIMESTAMP
     print profile
     print releaseLayer
     print buildStamp
@@ -144,7 +141,7 @@ stage 'Build'
 def buildTargetMap = [:]
 for (item in targetList){
     def id = item+'_build'
-    buildTargetMap[id] = targetBuild(item)
+    buildTargetMap[id] = targetBuild(item, images_to_buid, profile, buildStamp, releaseLayer)
 }
 // Run threads for each target in parallel
 parallel buildTargetMap
-- 
cgit v1.2.3-54-g00ecf