add: ensure that for Org Administrator actions certificate login is used

[gigi.git] / doc / jenkinsJob / config.xml

diff --git a/doc/jenkinsJob/config.xml b/doc/jenkinsJob/config.xml
index b37d0afaa34b29187441ccd86cc3866da55ab01f..852e725d9a44def7dcb6456b54609b575120651a 100644 (file)
--- 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@3.1.0">
+      <hudson.plugins.git.GitSCM plugin="git@3.5.1">
         <configVersion>2</configVersion>
         <userRemoteConfigs>
           <hudson.plugins.git.UserRemoteConfig>
@@ -50,7 +52,7 @@
         </userRemoteConfigs>
         <branches>
           <hudson.plugins.git.BranchSpec>
-            <name>15a2e696752bba33decf70e4ac7eed5e36d8d93e</name>
+            <name>master</name>
           </hudson.plugins.git.BranchSpec>
         </branches>
         <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -61,7 +63,7 @@
           </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
       </hudson.plugins.git.GitSCM>
-      <hudson.plugins.git.GitSCM plugin="git@3.1.0">
+      <hudson.plugins.git.GitSCM plugin="git@3.5.1">
         <configVersion>2</configVersion>
         <userRemoteConfigs>
           <hudson.plugins.git.UserRemoteConfig>
@@ -161,10 +163,6 @@ 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 ../../nre/generated/signer-server-*.tar.gz; do
@@ -172,6 +170,10 @@ for i in ../../nre/generated/signer-server-*.tar.gz; do
 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$$$$
@@ -219,7 +222,9 @@ EOT
 localePath=$$$$LOCALE_FETCH_PATH$$$$</properties>
     </hudson.tasks.Ant>
     <hudson.tasks.Shell>
-      <command>cd 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>
@@ -240,4 +245,4 @@ dpkg-buildpackage -b -us -uc</command>
     </hudson.tasks.junit.JUnitResultArchiver>
   </publishers>
   <buildWrappers/>
-</project>
\ No newline at end of file
+</project>