You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/02/18 19:43:16 UTC

[netbeans-jenkins-lib] branch master updated: change folder layout for voting candidate

This is an automated email from the ASF dual-hosted git repository.

skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new e391477  change folder layout for voting candidate
e391477 is described below

commit e391477a1481583676c2557739466590b3d9ea1d
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Tue Feb 18 20:43:03 2020 +0100

    change folder layout for voting candidate
---
 vars/asfMainNetBeansBuild.groovy | 42 +++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 7df17f7..d3d9906 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -32,6 +32,9 @@ def call(Map params = [:]) {
     def rmversion=""
     def mavenVersion=""
     def month=""
+    def votecandidate=false
+    def vote=""
+    
     pipeline {
         options {
             buildDiscarder(logRotator(numToKeepStr: '2'))
@@ -92,7 +95,9 @@ def call(Map params = [:]) {
                                 if (key==githash) {
                                     // vote candidate prior
                                     if (value['vote']) {
-                                        rmversion = rmversion+'-vc'+value['vote']
+                                        votecandidate = true
+                                        vote = value['vote']
+                                        rmversion = rmversion
                                     } else if (value['version']){
                                         // other named version
                                         rmversion = rmversion+'-'+value['version']
@@ -165,19 +170,38 @@ def call(Map params = [:]) {
                                 sh "rm -rf ${env.WORKSPACE}/mavenrepository"
                                 
                                 // create dist folder and content
-                                sh "mkdir ${env.WORKSPACE}/dist"
-                                sh "cp ${env.WORKSPACE}/nbbuild/build/*platform*.zip ${env.WORKSPACE}/dist/netbeans-platform-${rmversion}-source.zip"
-                                sh "cp ${env.WORKSPACE}/nbbuild/build/release*.zip ${env.WORKSPACE}/dist/netbeans-${rmversion}-source.zip"
-                                sh "cp ${env.WORKSPACE}/build-platform-temp/nbbuild/*.zip ${env.WORKSPACE}/dist/netbeans-platform-${rmversion}-bin.zip"
-                                sh "cp ${env.WORKSPACE}/build-release-temp/nbbuild/*-release.zip ${env.WORKSPACE}/dist/netbeans-${rmversion}-bin.zip"
-                                sh "mkdir ${env.WORKSPACE}/dist/nbms"
+                                def versionpath = "";
+                                def platformpath = "";
+                                def releasepath = "";
+                                if (votecandidate) {
+                                    versionpath = "/${version}/"vc"${vote}"
+                                    platformpath = "/netbeans-platform/netbeans-platform${versionpath}/"
+                                    releasepath = "/netbeans/netbeans${versionpath}/";
+                                }
+                                
+                                sh "mkdir -p ${env.WORKSPACE}/dist${platformpath}"
+                                // source
+                                sh "cp ${env.WORKSPACE}/nbbuild/build/*platform*.zip ${env.WORKSPACE}/dist${platformpath}netbeans-platform-${rmversion}-source.zip"
+                                // binaries
+                                sh "cp ${env.WORKSPACE}/build-platform-temp/nbbuild/*.zip ${env.WORKSPACE}/dist${platformpath}netbeans-platform-${rmversion}-bin.zip"
+                                
+                                
+                                sh "mkdir -p ${env.WORKSPACE}/dist${releasepath}"
+                                
+                                sh "cp ${env.WORKSPACE}/nbbuild/build/release*.zip ${env.WORKSPACE}/dist${releasepath}netbeans-${rmversion}-source.zip"
+                                sh "cp ${env.WORKSPACE}/build-release-temp/nbbuild/*-release.zip ${env.WORKSPACE}/dist${releasepath}netbeans-${rmversion}-bin.zip"
+                                sh "mkdir ${env.WORKSPACE}/dist${releasepath}nbms"
                                  
-                                // creat maven repository folder and content
+                                // create maven repository folder and content
                                 sh "mkdir ${env.WORKSPACE}/mavenrepository"
-                                sh "cp -r ${env.WORKSPACE}/build-release-temp/nbbuild/nbms/** ${env.WORKSPACE}/dist/nbms/"
+                                
+                                //checksume
+                                sh "cp -r ${env.WORKSPACE}/build-release-temp/nbbuild/nbms/** ${env.WORKSPACE}/dist${releasepath}nbms/"
                                 sh "cd ${env.WORKSPACE}/dist"+' && for z in $(find . -name "*.zip") ; do sha512sum $z >$z.sha512 ; done'
                                 sh "cd ${env.WORKSPACE}/dist"+' && for z in $(find . -name "*.nbm") ; do sha512sum $z >$z.sha512 ; done'
                                 sh "cd ${env.WORKSPACE}/dist"+' && for z in $(find . -name "*.gz") ; do sha512sum $z >$z.sha512 ; done'
+                                sh "cd ${env.WORKSPACE}/dist"+' && for z in $(find . -name "*.jar") ; do sha512sum $z >$z.sha512 ; done'
+                                sh "cd ${env.WORKSPACE}/dist"+' && for z in $(find . -name "*.xml") ; do sha512sum $z >$z.sha512 ; done'
                                 
                                 archiveArtifacts 'dist/**'
                                 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists