diff --git a/publish/packagecollection.groovy b/publish/packagecollection.groovy index a2c8656..f3f313f 100644 --- a/publish/packagecollection.groovy +++ b/publish/packagecollection.groovy @@ -2,8 +2,9 @@ def packagecollection = null /* Example expected JSON { - "packages": { - "gis-hmb-fd-hv-esw-el-sg1024": { + "packages": [ + { + "Name": "gis-hmb-fd-hv-esw-el-sg1024", "Location": "Jenkins job artifact", "Job": "HMB_FD_HV_0.9.6/HMB_FD_HV_app_0.9.6_debpackage", "Job selector": "1248", @@ -11,7 +12,8 @@ def packagecollection = null "Release repo revision": "refs/tag/0.9.6.57669", "Path": "package/gis-hmb-fd-hv-esw-el-sg1024_armhf.deb" }, - "gis-hmb-fd-hv-control-service-sg1024": { + { + "Name", "gis-hmb-fd-hv-control-service-sg1024", "Location": "Jenkins job artifact", "Job": "HMB_FD_HV_0.9.6/HMB_FD_HV_control_0.9.6_debpackage", "Job selector": "1722", @@ -19,7 +21,7 @@ def packagecollection = null "Release repo revision": "refs/tag/0.9.6.7964", "Path": "package/gis-hmb-fd-hv-control-service-sg1024_armhf.deb" } - } + ] } */ @@ -71,7 +73,7 @@ pipeline { debpackagecollection = packagecollection_get() debpackagecollection.packages.each { debpackageinfo-> - echo "Processing package: ${debpackageinfo.key}\n${debpackageinfo}\n${debpackageinfo.getClass()}" + echo "Processing package: ${debpackageinfo.Name}\n${debpackageinfo}\n${debpackageinfo.getClass()}" echo "Info: ${debpackageinfo.Location}" echo "Info: ${debpackageinfo['Location']}" echo "Info: ${debpackageinfo['Job']}" @@ -79,7 +81,7 @@ pipeline { echo "Info: ${debpackageinfo['Release repo']}" echo "Info: ${debpackageinfo['Release repo revision']}" - def packagedest = "${PACKAGEDEST}/${packagekey}" + def packagedest = "${PACKAGEDEST}/${debpackageinfo.Name}" def packageimportoptions = importer.getNewImportOptions() // For backward compatibility - in case these parameters are not supplied