From e05751faad1c41298ff1bc17b9da05a95ab5a925 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 5 Oct 2017 18:58:29 +0200
Subject: [PATCH] upd: modifications in jenkins job to use newest NRE

Change-Id: I938cd266ffaa371194f9dbbd1802fab357df59e0
---
 doc/jenkinsJob/config.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/jenkinsJob/config.xml b/doc/jenkinsJob/config.xml
index f9f61f04..00a23c16 100644
--- a/doc/jenkinsJob/config.xml
+++ b/doc/jenkinsJob/config.xml
@@ -40,7 +40,7 @@
   </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 +50,7 @@
         </userRemoteConfigs>
         <branches>
           <hudson.plugins.git.BranchSpec>
-            <name>15a2e696752bba33decf70e4ac7eed5e36d8d93e</name>
+            <name>master</name>
           </hudson.plugins.git.BranchSpec>
         </branches>
         <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -61,7 +61,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 +161,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 +168,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
@@ -183,6 +183,7 @@ sql.driver=org.postgresql.Driver
 sql.url=$$$$sql url$$$$
 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$$$$
-- 
2.39.2