From bd8144a67cee225103752b2ab9cb3c71c4974e4b Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Wed, 27 Nov 2019 11:45:30 +0100
Subject: [PATCH] :construction_worker: Jenkins : config file is now picked by
 the unattended install The problem was that we had an absolute path in the
 XML : changing it to the file name is sufficient ! The copy introduced in
 443763de was unecessary.

---
 .jenkins/bin/unattended_install/default_env.sh               | 5 -----
 .../unattended_install/default-params.xml                    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.jenkins/bin/unattended_install/default_env.sh b/.jenkins/bin/unattended_install/default_env.sh
index e4d18920b..e02b87fd6 100755
--- a/.jenkins/bin/unattended_install/default_env.sh
+++ b/.jenkins/bin/unattended_install/default_env.sh
@@ -6,8 +6,3 @@ chmod 666 conf/production/config-itop.php
 
 cd toolkit
 php unattended_install.php --response_file=default-params.xml --clean=true
-
-cd ..
-chmod 666 conf/production/config-itop.php
-cp toolkit/default-config-itop.php conf/production/config-itop.php
-chmod 444 conf/production/config-itop.php
diff --git a/.jenkins/configuration/default-environment/unattended_install/default-params.xml b/.jenkins/configuration/default-environment/unattended_install/default-params.xml
index 83bc798d3..e6139784e 100644
--- a/.jenkins/configuration/default-environment/unattended_install/default-params.xml
+++ b/.jenkins/configuration/default-environment/unattended_install/default-params.xml
@@ -7,7 +7,7 @@
     </preinstall>
     <source_dir>datamodels/2.x/</source_dir>
     <datamodel_version>2.5.0</datamodel_version>
-    <previous_configuration_file>/var/lib/jenkins/workspace/iTop-CI/unattended_install/default-config-itop.php</previous_configuration_file>
+    <previous_configuration_file>default-config-itop.php</previous_configuration_file>
     <extensions_dir>extensions</extensions_dir>
     <target_env>production</target_env>
     <workspace_dir></workspace_dir>