Merge ~dannf/charms/+source/scalebot-jenkins:rename-mkjobs into ~ce-hyperscale/charms/+source/scalebot-jenkins:master

[dann frazier]

Thought to do this when Alexandre wanted to update the python-maas library after his release job was added.

[Andrew Cloke (andrew-cloke)]

Agreed. The renaming makes sense.

[Andrew Cloke (andrew-cloke)]

Agreed. The renaming makes sense.

review: Approve

diff --git a/README.md b/README.md
index 4e8cfd6..43e5e2f 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ labs/<labname>/clouds.yaml
 labs/<labname>/credentials.yaml
 labs/<labname>/model-defaults.yaml
 scalebot.d/init
-scalebot.d/mkjobs
+scalebot.d/refresh
 ```
 
 Jobs must be in the YAML format used by [Jenkins Job Builder](https://docs.openstack.org/infra/jenkins-job-builder), as that is the tool used to load them into Jenkins. The clouds.yaml, credentials.yaml, and model-defaults.yaml files are passed directly to Juju when bootsrapping the Lab controller, so see [Juju documentation](http://jujucharms.com/docs) for details on their contents.
@@ -88,5 +88,5 @@ In addition to the environment variables set by Jenkins, the following variable 
 ## scalebot.d/init hook
 If it exists, ```$SCALEBOT_REPO/scalebot.d/init``` will be executed each time the configuration repository is refreshed. You can use this to install any additional dependencies needed for your jobs.
 
-## scalebot.d/mkjobs hook
-If it exists, ```$SCALEBOT_REPO/scalebot.d/mkjobs``` will be executed after the repository is updated, and before loading jobs. This is useful in case something job yaml files need to be dynamically generated.
+## scalebot.d/refresh hook
+If it exists, ```$SCALEBOT_REPO/scalebot.d/refresh``` will be executed after the repository is updated, and before loading jobs. This is useful in case something job yaml files need to be dynamically generated.
diff --git a/bin/pull-and-reload-jobs b/bin/pull-and-reload-jobs
index 8a1775a..330f824 100755
--- a/bin/pull-and-reload-jobs
+++ b/bin/pull-and-reload-jobs
@@ -10,9 +10,9 @@ set -x
 [ -n "$SCALEBOT_REPO" ]
 
 git -C ${SCALEBOT_REPO} pull --ff-only
-mkjobs="${SCALEBOT_REPO}/scalebot.d/mkjobs"
-if [ -x "$mkjobs" ]; then
-    $mkjobs
+refresh="${SCALEBOT_REPO}/scalebot.d/refresh"
+if [ -x "$refresh" ]; then
+    $refresh
 fi
 jobsync="${SCALEBOT_HOME}/bin/jobsync.py"
 ${jobsync} -j ${SCALEBOT_JOBSET} -s