Merge ~dannf/charms/+source/scalebot-jenkins:env-fix into ~ce-hyperscale/charms/+source/scalebot-jenkins:master

[dann frazier]

[dann frazier (dannf)]

I verified this by deploying and adding a jenkins job that just runs "/usr/bin/env". The output included:

PYTHONPATH=/srv/scalebot/repo/lib/LibJuju
SCALEBOT_REPO=/srv/scalebot/repo

Also, this reminded me that git clone isn't pulling submodules (i.e. libjuju), so we need to fix that as well.

[Sean Feole (sfeole)]

+1 merge it

review: Approve

diff --git a/reactive/scalebot-jenkins.py b/reactive/scalebot-jenkins.py
index 6c698a2..a774aec 100644
--- a/reactive/scalebot-jenkins.py
+++ b/reactive/scalebot-jenkins.py
@@ -18,8 +18,10 @@ from charms.reactive import (
 )
 from charms.reactive.helpers import data_changed
 
-SCALEBOT_ROOT = "/srv/scalebot"
-PYTHONPATH = "$SCALEBOT_ROOT/lib/LibJuju"
+SCALEBOT_HOME = "/srv/scalebot"
+SCALEBOT_REPO = os.path.join(SCALEBOT_HOME, "repo")
+PYTHONPATH = os.path.join(SCALEBOT_REPO, "lib", "LibJuju")
+
 
 @when("extension.available")
 def configure_jenkins_jobbuilder(extension):
@@ -52,14 +54,15 @@ def unconfigure_jobbuilder():
 
 @only_once
 def configure_scalebot_env():
-    ''' Set SCALEBOT_ROOT and PYTHONPATH'''
+    ''' Set SCALEBOT_REPO and PYTHONPATH'''
     sbprofile = "/etc/profile.d/scalebot.sh"
-    sbroot = 'export SCALEBOT_ROOT="%s"' % SCALEBOT_ROOT
+    sbrepo = 'export SCALEBOT_REPO="%s"' % SCALEBOT_REPO
     ppath = 'export PYTHONPATH="%s"' % PYTHONPATH
 
-    configfile = open(sbprofile, "w")
-    configfile.write("#Export Scalebot required paths\n%s\n%s\n" % (sbroot, ppath))
-    configfile.close()
+    with open(sbprofile, 'w') as f:
+        f.write("#Export Scalebot required paths\n")
+        f.write("%s\n" % (sbrepo))
+        f.write("%s\n" % (ppath))
 
 
 def scalebot_git_config_check():
@@ -96,12 +99,12 @@ def scalebot_git_clone():
     status_set('maintenance', 'Cloning Scalebot repository')
 
     try:
-        shutil.rmtree(SCALEBOT_ROOT)
+        shutil.rmtree(SCALEBOT_HOME)
     except FileNotFoundError:
         pass
 
-    os.makedirs(SCALEBOT_ROOT)
-    shutil.chown(SCALEBOT_ROOT, user='ubuntu', group='ubuntu')
+    os.makedirs(SCALEBOT_HOME)
+    shutil.chown(SCALEBOT_HOME, user='ubuntu', group='ubuntu')
 
     keyfile = tempfile.NamedTemporaryFile(mode='w', delete=False)
     keypath = keyfile.name
@@ -115,7 +118,7 @@ def scalebot_git_clone():
     git_ssh = '"/usr/bin/ssh -v -i %s -o UserKnownHostsFile=%s"' % \
               (keypath, known_hosts)
     git_cmd = 'GIT_SSH_COMMAND=%s /usr/bin/git clone -b %s %s %s' % \
-              (git_ssh, branch, repo, os.path.join(SCALEBOT_ROOT, 'repo'))
+              (git_ssh, branch, repo, os.path.join(SCALEBOT_HOME, 'repo'))
     su_git_cmd = ['/bin/su', '-', 'ubuntu', '-c', git_cmd]
     log("Beginning git clone")
     log(su_git_cmd)