Use git config to set values on JJB config
Git config does not support '_' in the variable names,
hence use '-' in the .ini file and replace all of them at the
end of the config with a tr.
Change-Id: I611961b84f9446c3b4f9ea392d8ff78ecc7df2f2
diff --git a/jenkins-docker/master/config.sh b/jenkins-docker/master/config.sh
index d10698a..cfa3197 100755
--- a/jenkins-docker/master/config.sh
+++ b/jenkins-docker/master/config.sh
@@ -19,8 +19,15 @@
$JENKINS_REF/edit-config.xslt $CONFIG > /tmp/config.xml.new
mv /tmp/config.xml.new $CONFIG
-sed -i -e "s/user=.*/user=$JENKINS_API_USER/" /etc/jenkins_jobs/jenkins_jobs.ini
-sed -i -e "s/password=.*/password=$JENKINS_API_PASSWORD/" /etc/jenkins_jobs/jenkins_jobs.ini
+function config {
+ git config -f /etc/jenkins_jobs/jenkins_jobs.ini $1 $2
+}
+
+config jenkins.user $JENKINS_API_USER
+config jenkins.password $JENKINS_API_PASSWORD
+
+mv /etc/jenkins_jobs/jenkins_jobs.ini /tmp/
+cat /tmp/jenkins_jobs.ini | tr '-' '_' | tr -d '\t' > /etc/jenkins_jobs/jenkins_jobs.ini
cp -R $JENKINS_REF/.ssh ~jenkins/.
chown -R jenkins:dockergroup ~jenkins
diff --git a/jenkins-docker/master/jenkins_jobs.ini b/jenkins-docker/master/jenkins_jobs.ini
index 400be8d..3d43d59 100644
--- a/jenkins-docker/master/jenkins_jobs.ini
+++ b/jenkins-docker/master/jenkins_jobs.ini
@@ -1,12 +1,10 @@
-[job_builder]
-ignore_cache=True
-keep_descriptions=False
-include_path=~/gerrit-ci-scripts/jenkins
+[job-builder]
+ignore-cache=True
+keep-descriptions=False
+include-path=~/gerrit-ci-scripts/jenkins
recursive=False
-allow_duplicates=False
+allow-duplicates=False
[jenkins]
-user=#JENKINS_API_USER#
-password=#JENKINS_API_PASSWORD#
url=http://127.0.0.1:8080
-query_plugins_info=False
+query-plugins-info=False
