X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=doc%2FjenkinsJob%2Fconfig.xml;h=852e725d9a44def7dcb6456b54609b575120651a;hb=612c5077c946fdfc61c39a2cc034f0e4910cf54d;hp=94388357b3a756151d0733bd121e1f4466bfc925;hpb=15cdd016fea23498fcbf297756b991b3a3609a5d;p=gigi.git

diff --git a/doc/jenkinsJob/config.xml b/doc/jenkinsJob/config.xml
index 94388357..852e725d 100644
--- a/doc/jenkinsJob/config.xml
+++ b/doc/jenkinsJob/config.xml
@@ -29,18 +29,20 @@
           <name>BRANCH</name>
           <description>The branch to build from.</description>
           <defaultValue>$GERRIT_PATCHSET_REVISION</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JAVA_HOME</name>
           <description></description>
           <defaultValue>/usr/lib/jvm/openjdk-8-jdk-gigi</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
   <scm class="org.jenkinsci.plugins.multiplescms.MultiSCM" plugin="multiple-scms@0.6">
     <scms>
-      <hudson.plugins.git.GitSCM plugin="git@2.4.4">
+      <hudson.plugins.git.GitSCM plugin="git@3.5.1">
         <configVersion>2</configVersion>
         <userRemoteConfigs>
           <hudson.plugins.git.UserRemoteConfig>
@@ -50,18 +52,18 @@
         </userRemoteConfigs>
         <branches>
           <hudson.plugins.git.BranchSpec>
-            <name>15a2e696752bba33decf70e4ac7eed5e36d8d93e</name>
+            <name>master</name>
           </hudson.plugins.git.BranchSpec>
         </branches>
         <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
         <submoduleCfg class="list"/>
         <extensions>
           <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-            <relativeTargetDir>cacert-nre</relativeTargetDir>
+            <relativeTargetDir>nre</relativeTargetDir>
           </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
       </hudson.plugins.git.GitSCM>
-      <hudson.plugins.git.GitSCM plugin="git@2.4.4">
+      <hudson.plugins.git.GitSCM plugin="git@3.5.1">
         <configVersion>2</configVersion>
         <userRemoteConfigs>
           <hudson.plugins.git.UserRemoteConfig>
@@ -79,7 +81,7 @@
         <submoduleCfg class="list"/>
         <extensions>
           <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-            <relativeTargetDir>cacert-gigi</relativeTargetDir>
+            <relativeTargetDir>gigi</relativeTargetDir>
           </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
           <hudson.plugins.git.extensions.impl.CleanBeforeCheckout/>
         </extensions>
@@ -149,29 +151,29 @@
   <builders>
     <hudson.tasks.Shell>
       <command># --- generating and installing keys
-cd cacert-nre
+cd nre
 cat &lt;&lt;EOT &gt;config
 DOMAIN=$$$$YOUR_LOOKUP_DOMAIN$$$$
 KEYSIZE=1024
 EOT
 ./all root 2015 $(date +%Y)
 
-cd ../cacert-gigi
-for i in ../cacert-nre/generated/gigi-*.tar.gz; do
+cd ../gigi
+for i in ../nre/generated/gigi-*.tar.gz; do
   tar xf &quot;$i&quot;
 done
 
-cd config
-./generateTruststoreNRE.sh
-cd ..
-
 mkdir -p signer
 cd signer
-for i in ../../cacert-nre/generated/signer-server-*.tar.gz; do
+for i in ../../nre/generated/signer-server-*.tar.gz; do
   tar xf &quot;$i&quot;
 done
 cd ..
 
+cd config
+DOMAIN=$$$$YOUR_LOOKUP_DOMAIN$$$$ ./generateTruststoreNRE.sh
+cd ..
+
 # --- config gigi
 cat &lt;&lt;EOT &gt;config/test.properties
 type=autonomous
@@ -181,8 +183,9 @@ serverPort.http=8098
 mailPort=8473
 sql.driver=org.postgresql.Driver
 sql.url=$$$$sql url$$$$
-sql.user=cacert
+sql.user=$$$$sql user$$$$
 sql.password=$$$$sql password$$$$
+name.suffix=$$$$YOUR_LOOKUP_DOMAIN$$$$
 name.static=static.$$$$YOUR_LOOKUP_DOMAIN$$$$
 name.secure=secure.$$$$YOUR_LOOKUP_DOMAIN$$$$
 name.www=www.$$$$YOUR_LOOKUP_DOMAIN$$$$
@@ -214,26 +217,28 @@ EOT
     <hudson.tasks.Ant plugin="ant@1.3">
       <targets>build-testing-l10n $TARGET generatecoco</targets>
       <antOpts>-Dfile.encoding=UTF-8</antOpts>
-      <buildFile>cacert-gigi/build.xml</buildFile>
+      <buildFile>gigi/build.xml</buildFile>
       <properties>jdt=$$$$JDT_PATH$$$$
 localePath=$$$$LOCALE_FETCH_PATH$$$$</properties>
     </hudson.tasks.Ant>
     <hudson.tasks.Shell>
-      <command>cd cacert-gigi
+      <command>rm -v *.deb
+cd gigi
+[ -f doc/scripts/genchangelog ] &amp;&amp; doc/scripts/genchangelog
 dpkg-buildpackage -b -us -uc</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
     <hudson.tasks.ArtifactArchiver>
-      <artifacts>cacert-gigi/natives/*.so,cacert-gigi/gigi*.jar,*.deb,cacert-gigi/cocoReport/**,cacert-gigi/merged.exec,cacert-gigi/messages.po</artifacts>
+      <artifacts>gigi/natives/*.so,gigi/gigi*.jar,*.deb,gigi/cocoReport/**,gigi/merged.exec,gigi/messages.po</artifacts>
       <allowEmptyArchive>false</allowEmptyArchive>
       <onlyIfSuccessful>false</onlyIfSuccessful>
       <fingerprint>true</fingerprint>
       <defaultExcludes>true</defaultExcludes>
       <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
-    <hudson.tasks.junit.JUnitResultArchiver plugin="junit@1.15">
-      <testResults>cacert-gigi/junit/*.xml</testResults>
+    <hudson.tasks.junit.JUnitResultArchiver plugin="junit@1.20">
+      <testResults>gigi/junit/*.xml</testResults>
       <keepLongStdio>false</keepLongStdio>
       <healthScaleFactor>1.0</healthScaleFactor>
       <allowEmptyResults>false</allowEmptyResults>