X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jenkins-init-scripts%2Finit.sh;h=66053b0db4bc8a9c75f53eab5795888a14243523;hb=fe2beb15bc9effb5b91ba17b520ab6c167dd6604;hp=1bd2229e809317c79f7cff17737cf7e69e0e6d4e;hpb=76f492c41f20bc7bf634f3c40cb19cd4e26a54ed;p=releng%2Fglobal-jjb.git

diff --git a/jenkins-init-scripts/init.sh b/jenkins-init-scripts/init.sh
index 1bd2229e..66053b0d 100755
--- a/jenkins-init-scripts/init.sh
+++ b/jenkins-init-scripts/init.sh
@@ -9,19 +9,24 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-INIT_SCRIPTS_DIR="/opt/ciman/global-jjb/jenkins-init-scripts"
+ciman_init_scripts=$(readlink -f "$(dirname "$0")"/../../jenkins-init-scripts)
+jjb_init_scripts=$(readlink -f "$(dirname "$0")")
 
-"$INIT_SCRIPTS_DIR/package-listing.sh"
-"$INIT_SCRIPTS_DIR/basic-settings.sh"
-"$INIT_SCRIPTS_DIR/disable-firewall.sh"
-"$INIT_SCRIPTS_DIR/create-swap-file.sh"
+"$jjb_init_scripts/package-listing.sh"
+"$jjb_init_scripts/basic-settings.sh"
+"$jjb_init_scripts/disable-firewall.sh"
+"$jjb_init_scripts/create-swap-file.sh"
 
 # Entry point for additional local minion customization
-# Eg. OpenDaylight has additional bootstrap scripts depending on minion type.
-if [ -f "/opt/ciman/jenkins-init-scripts/local-init.sh" ]; then
-    /opt/ciman/jenkins-init-scripts/local-init.sh
+# Note this is called before the 'jenkins' account is created
+if [ -e "$ciman_init_scripts/local-init.sh" ]; then
+    "$ciman_init_scripts/local-init.sh"
 fi
 
 # Create the jenkins user last so that hopefully we DO NOT have to deal with
 # guard files
-"$INIT_SCRIPTS_DIR/create-jenkins-user.sh"
+$jjb_init_scripts/create-jenkins-user.sh
+
+cp $jjb_init_scripts/lf-env.sh ~jenkins/
+chmod 644 ~jenkins/lf-env.sh
+chown jenkins:jenkins ~jenkins/lf-env.sh