commit e6354c943a48ff2c6c594e28df41d65c2d87fc78
author Eric Barboni <skygo@apache.org> Thu Sep 22 18:30:51 2022 +0200
committer GitHub <noreply@github.com> Thu Sep 22 18:30:51 2022 +0200
tree e79e58d216dc33e9fcfe05e5975a21f178a13724
parent 1c13bb64868f8535cd5c675554f5ee6e04a5c2c2

test zip by sh

vars/asfStandardBuild.groovy

diff --git a/vars/asfStandardBuild.groovy b/vars/asfStandardBuild.groovy
index 1406c26..d2d3160 100644
--- a/vars/asfStandardBuild.groovy
+++ b/vars/asfStandardBuild.groovy
@@ -35,8 +35,8 @@
 	 jdk = 'jdk_11_latest'
     }
     // use the cmdLine parameter otherwise default depending on current branch
-    def cmdline = params.containsKey('cmdline') ? params.cmdline : (env.BRANCH_NAME == 'master'?"clean deploy site:jar":"clean install")
-    def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.5.4'
+    def cmdline = params.containsKey('cmdline') ? params.cmdline : (env.BRANCH_NAME == 'master'?"clean deploy site:site site:stage":"clean install")
+    def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3_latest'
     def xvfb = params.containsKey('xvfb') ? true : false
 
     def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false),
@@ -131,7 +131,7 @@
         mavenLocalRepo: localRepo) {
         // Some common Maven command line + provided command line
         sh "mvn -V -B -U -e -DskipBrowserTests -Dmaven.test.failure.ignore=true $cmdline "
-	sh "mv target/*-site.jar WEBSITE.zip"
+	sh "cd target/staging; zip ../../WEBSITE.zip ."
     }
     archiveArtifacts 'WEBSITE.zip'
 }