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/incubator-netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push: new ae221c5 add buildnumber for populating maven artefacts experimental ae221c5 is described below commit ae221c5cf44410cfde2d8658ed4ee53ecec0bb72 Author: Eric Barboni <sk...@apache.org> AuthorDate: Mon Apr 8 15:03:48 2019 +0200 add buildnumber for populating maven artefacts experimental --- .../conveniences/Jenkinsfile-master.groovy | 3 +++ .../conveniences/Jenkinsfile-maven-master.groovy | 11 +++++---- .../Jenkinsfile-maven-release100.groovy | 11 +++++---- .../Jenkinsfile-maven-release110.groovy | 11 +++++---- .../Jenkinsfile-maven-release90.groovy | 11 +++++---- .../conveniences/Jenkinsfile-release100.groovy | 3 +++ .../conveniences/Jenkinsfile-release110.groovy | 3 +++ .../conveniences/Jenkinsfile-release90.groovy | 3 +++ buildscripts/conveniences/generatebuildscript.sh | 27 +++++++++++++++------- 9 files changed, 59 insertions(+), 24 deletions(-) diff --git a/buildscripts/conveniences/Jenkinsfile-master.groovy b/buildscripts/conveniences/Jenkinsfile-master.groovy index 6c9219d..a8dd571 100644 --- a/buildscripts/conveniences/Jenkinsfile-master.groovy +++ b/buildscripts/conveniences/Jenkinsfile-master.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = ${BUILD_TIMESTAMP} + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' diff --git a/buildscripts/conveniences/Jenkinsfile-maven-master.groovy b/buildscripts/conveniences/Jenkinsfile-maven-master.groovy index 781cfbc..1e51d8f 100644 --- a/buildscripts/conveniences/Jenkinsfile-maven-master.groovy +++ b/buildscripts/conveniences/Jenkinsfile-maven-master.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = ${BUILD_TIMESTAMP} + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' @@ -45,10 +48,10 @@ pipeline { steps { dir ('netbeanssources'){ withAnt(installation: 'Ant (latest)') { - sh 'ant' - sh 'ant build-javadoc' - sh 'ant build-source-zips' - sh 'ant build-nbms' + sh "ant -Dbuildnumber=${env.buildnumber}" + sh "ant build-javadoc -Dbuildnumber=${env.buildnumber}" + sh "ant build-source-zips -Dbuildnumber=${env.buildnumber}" + sh "ant build-nbms -Dbuildnumber=${env.buildnumber}" } } archiveArtifacts 'netbeanssources/nbbuild/netbeans/**' diff --git a/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy b/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy index cfdc5b8..7aabca2 100644 --- a/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy +++ b/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = 201812271200 + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' @@ -45,10 +48,10 @@ pipeline { steps { dir ('netbeanssources'){ withAnt(installation: 'Ant (latest)') { - sh 'ant' - sh 'ant build-javadoc' - sh 'ant build-source-zips' - sh 'ant build-nbms' + sh "ant -Dbuildnumber=${env.buildnumber}" + sh "ant build-javadoc -Dbuildnumber=${env.buildnumber}" + sh "ant build-source-zips -Dbuildnumber=${env.buildnumber}" + sh "ant build-nbms -Dbuildnumber=${env.buildnumber}" } } archiveArtifacts 'netbeanssources/nbbuild/netbeans/**' diff --git a/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy b/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy index cc766ea..f9ef280 100644 --- a/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy +++ b/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = 201902131200 + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' @@ -45,10 +48,10 @@ pipeline { steps { dir ('netbeanssources'){ withAnt(installation: 'Ant (latest)') { - sh 'ant' - sh 'ant build-javadoc' - sh 'ant build-source-zips' - sh 'ant build-nbms' + sh "ant -Dbuildnumber=${env.buildnumber}" + sh "ant build-javadoc -Dbuildnumber=${env.buildnumber}" + sh "ant build-source-zips -Dbuildnumber=${env.buildnumber}" + sh "ant build-nbms -Dbuildnumber=${env.buildnumber}" } } archiveArtifacts 'netbeanssources/nbbuild/netbeans/**' diff --git a/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy b/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy index 26618cf..bb685fa 100644 --- a/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy +++ b/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = 201807291200 + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' @@ -45,10 +48,10 @@ pipeline { steps { dir ('netbeanssources'){ withAnt(installation: 'Ant (latest)') { - sh 'ant' - sh 'ant build-javadoc' - sh 'ant build-source-zips' - sh 'ant build-nbms' + sh "ant -Dbuildnumber=${env.buildnumber}" + sh "ant build-javadoc -Dbuildnumber=${env.buildnumber}" + sh "ant build-source-zips -Dbuildnumber=${env.buildnumber}" + sh "ant build-nbms -Dbuildnumber=${env.buildnumber}" } } archiveArtifacts 'netbeanssources/nbbuild/netbeans/**' diff --git a/buildscripts/conveniences/Jenkinsfile-release100.groovy b/buildscripts/conveniences/Jenkinsfile-release100.groovy index 7ef8a72..2f9324d 100644 --- a/buildscripts/conveniences/Jenkinsfile-release100.groovy +++ b/buildscripts/conveniences/Jenkinsfile-release100.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = 201812271200 + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' diff --git a/buildscripts/conveniences/Jenkinsfile-release110.groovy b/buildscripts/conveniences/Jenkinsfile-release110.groovy index 4caa0fb..dab04f8 100644 --- a/buildscripts/conveniences/Jenkinsfile-release110.groovy +++ b/buildscripts/conveniences/Jenkinsfile-release110.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = 201902131200 + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' diff --git a/buildscripts/conveniences/Jenkinsfile-release90.groovy b/buildscripts/conveniences/Jenkinsfile-release90.groovy index 0781bcf..8596d31 100644 --- a/buildscripts/conveniences/Jenkinsfile-release90.groovy +++ b/buildscripts/conveniences/Jenkinsfile-release90.groovy @@ -7,6 +7,9 @@ pipeline { triggers { pollSCM('H/5 * * * * ') } + environment { + buildnumber = 201807291200 + } tools { maven 'Maven 3.3.9' jdk 'JDK 1.8 (latest)' diff --git a/buildscripts/conveniences/generatebuildscript.sh b/buildscripts/conveniences/generatebuildscript.sh index 93c99d2..3a76d4c 100644 --- a/buildscripts/conveniences/generatebuildscript.sh +++ b/buildscripts/conveniences/generatebuildscript.sh @@ -30,12 +30,13 @@ ant10='Ant (latest)' releaseinfo=[ ['release90', '9.0-vc3', True,jdk8,maven339,ant10,'1.4-SNAPSHOT', 'RELEASE90','org.apache.netbeans:netbeans-parent:1', 'http://bits.netbeans.org/9.0/javadoc', datetime(2018,07,29,12,00)], ['release100','10.0-vc5', True,jdk8,maven339,ant10,'1.4-SNAPSHOT','RELEASE100','org.apache.netbeans:netbeans-parent:1','http://bits.netbeans.org/10.0/javadoc', datetime(2018,12,27,12,00)], -## not yet (under review) ['release110','11.0-vc4', True,jdk8,maven339,ant10,'1.4-SNAPSHOT','RELEASE110','org.apache.netbeans:netbeans-parent:1','http://bits.netbeans.org/11.0/javadoc', datetime(2019,02,13,12,00)], +## not yet (under review) +#['release120',' ', True,jdk8,maven339,ant10,'1.4-SNAPSHOT','RELEASE120','org.apache.netbeans:netbeans-parent:1','http://bits.netbeans.org/12.0/javadoc', datetime(2019,02,13,12,00)], ##master branch ['master','', True,jdk8,maven339,ant10,'1.4-SNAPSHOT','dev-SNAPSHOT','org.apache.netbeans:netbeans-parent:1']] ## no need custom info -def write_pipelinebasic(afile,scm,jdktool,maventool,anttool): +def write_pipelinebasic(afile,scm,jdktool,maventool,anttool,buildnumber): afile.write("pipeline {\n") afile.write(" agent { label 'ubuntu' }\n") afile.write(" options {\n") @@ -45,6 +46,12 @@ def write_pipelinebasic(afile,scm,jdktool,maventool,anttool): afile.write(" triggers {\n") afile.write(" pollSCM('H/5 * * * * ')\n") afile.write(" }\n") + afile.write(" environment {\n") + if buildnumber=='': + afile.write(" buildnumber = ${BUILD_TIMESTAMP} \n") + else: + afile.write(" buildnumber = "+buildnumber+"\n") + afile.write(" }\n") afile.write(" tools {\n") afile.write(" maven '"+maventool+"'\n") afile.write(" jdk '"+jdktool+"'\n") @@ -95,8 +102,12 @@ for arelease in releaseinfo: anttool=arelease[5] apidocbuildFile = open ('Jenkinsfile-'+arelease[0]+'.groovy',"w") mavenbuildfile = open ('Jenkinsfile-maven-'+arelease[0]+'.groovy',"w") - write_pipelinebasic(apidocbuildFile,branch,jdktool,maventool,anttool) - write_pipelinebasic(mavenbuildfile,tag,jdktool,maventool,anttool) + if branch=='refs/heads/master': + buildnumber = "" + else: + buildnumber = arelease[10].strftime('%Y%m%d%H%M') + write_pipelinebasic(apidocbuildFile,branch,jdktool,maventool,anttool,buildnumber) + write_pipelinebasic(mavenbuildfile ,tag, jdktool,maventool,anttool,buildnumber) ## needed until we had mavenutil ready ##prepare nb-repository from master to populate @@ -149,10 +160,10 @@ for arelease in releaseinfo: mavenbuildfile.write(" steps {\n") mavenbuildfile.write(" dir ('netbeanssources'){\n") mavenbuildfile.write(" withAnt(installation: '"+anttool+"') {\n") - mavenbuildfile.write(" sh 'ant'\n") - mavenbuildfile.write(" sh 'ant build-javadoc'\n") - mavenbuildfile.write(" sh 'ant build-source-zips'\n") - mavenbuildfile.write(" sh 'ant build-nbms'\n") + mavenbuildfile.write(' sh "ant -Dbuildnumber=${env.buildnumber}"\n') + mavenbuildfile.write(' sh "ant build-javadoc -Dbuildnumber=${env.buildnumber}"\n') + mavenbuildfile.write(' sh "ant build-source-zips -Dbuildnumber=${env.buildnumber}"\n') + mavenbuildfile.write(' sh "ant build-nbms -Dbuildnumber=${env.buildnumber}"\n') mavenbuildfile.write(" }\n") mavenbuildfile.write(" }\n") mavenbuildfile.write(" archiveArtifacts 'netbeanssources/nbbuild/netbeans/**'\n") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists