Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Jenkins Init Scripts
[releng/global-jjb.git]
/
jenkins-init-scripts
/
create-jenkins-user.sh
diff --git
a/jenkins-init-scripts/create-jenkins-user.sh
b/jenkins-init-scripts/create-jenkins-user.sh
index
40ac25f
..
0983129
100755
(executable)
--- a/
jenkins-init-scripts/create-jenkins-user.sh
+++ b/
jenkins-init-scripts/create-jenkins-user.sh
@@
-10,6
+10,13
@@
##############################################################################
OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
##############################################################################
OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
+OS_RELEASE=$(facter lsbdistrelease | tr '[:upper:]' '[:lower:]')
+
+if [[ "$OS_RELEASE" == "18.04" ]] && [[ "$OS" == 'ubuntu' ]]
+then
+ echo 'PATH=$HOME/.local/bin:$PATH
+export PATH' >> /etc/profile
+fi
useradd -m -s /bin/bash jenkins
useradd -m -s /bin/bash jenkins
@@
-22,10
+29,14
@@
if grep -q mock /etc/group; then
usermod -a -G mock jenkins
fi
usermod -a -G mock jenkins
fi
-mkdir /home/jenkins/.ssh
/w
+mkdir /home/jenkins/.ssh
cp -r "/home/${OS}/.ssh/authorized_keys" /home/jenkins/.ssh/authorized_keys
# Generate ssh key for use by Robot jobs
echo -e 'y\n' | ssh-keygen -N "" -f /home/jenkins/.ssh/id_rsa -t rsa
cp -r "/home/${OS}/.ssh/authorized_keys" /home/jenkins/.ssh/authorized_keys
# Generate ssh key for use by Robot jobs
echo -e 'y\n' | ssh-keygen -N "" -f /home/jenkins/.ssh/id_rsa -t rsa
-chown -R jenkins:jenkins /home/jenkins/.ssh
/w
+chown -R jenkins:jenkins /home/jenkins/.ssh
chmod 700 /home/jenkins/.ssh
chmod 700 /home/jenkins/.ssh
+
+# The '/w' volume may already be part of image
+[[ ! -d '/w' ]] && mkdir /w
+chown -R jenkins:jenkins /w