From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 17 Aug 2017 14:48:12 +0000 (+0200)
Subject: lib.sh: Fix mcp key owner for OPNFV Jenkins jobs
X-Git-Tag: opnfv-5.0.RC1~144
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F39513%2F2;p=fuel.git

lib.sh: Fix mcp key owner for OPNFV Jenkins jobs

In case of non-root deploys (i.e. running `ci/deploy.sh` without
sudo), the OPNFV Jenkins slave executes it under a user shell,
under a root shell, e.g.:
$ sudo sudo -u jenkins bash
$ echo $USER
jenkins
$ echo $SUDO_USER
root

Adjust lib.sh to only use SUDO_USER when it is not "root".

Change-Id: I6dd1c8a5dd3a3b02cfb760818d66e99f49709a5b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 8d4510084..d9c6454f2 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -4,7 +4,10 @@
 #
 
 generate_ssh_key() {
-  local user=${SUDO_USER:-$USER}
+  local user=${USER}
+  if [ -n "${SUDO_USER}" ] && [ "${SUDO_USER}" != 'root' ]; then
+    user=${SUDO_USER}
+  fi
 
   [ -f "${SSH_KEY}" ] || ssh-keygen -f "${SSH_KEY}" -N ''
   install -o "${user}" -m 0600 "${SSH_KEY}" /tmp/