Merge "Configure VPP Jenkins view"

[ci-management.git] / jenkins-scripts / create_jenkins_user.sh

diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
index 779d1f7..960b04b 100755 (executable)
--- a/jenkins-scripts/create_jenkins_user.sh
+++ b/jenkins-scripts/create_jenkins_user.sh
@@ -15,7 +15,8 @@
 
 OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
 
-useradd -m -s /bin/bash jenkins
+groupadd jenkins
+useradd -m -s /bin/bash -g jenkins jenkins
 
 # Check if docker group exists
 grep -q docker /etc/group
@@ -35,7 +36,15 @@ fi
 
 mkdir /home/jenkins/.ssh
 mkdir /w
-cp -r /home/${OS}/.ssh/authorized_keys /home/jenkins/.ssh/authorized_keys
+
+if [ "$OS" = "opensuse" ];
+then
+  OS_USER="root"
+else
+  OS_USER="home/${OS}"
+fi
+#Generate ssh key for use by Robot jobs
+cp -r /${OS_USER}/.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