Juju Charms Collection
scalebot-jenkins package

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

  1. Git
  2. lp:~dannf/charms/+source/scalebot-jenkins
  3. rename-mkjobs
  4. Merge into master
Proposed by dann frazier
Status: Merged
Approved by: Andrew Cloke
Approved revision: 1c513851afb964620ff27f843f139c62022cf64f
Merged at revision: 1c513851afb964620ff27f843f139c62022cf64f
Proposed branch: ~dannf/charms/+source/scalebot-jenkins:rename-mkjobs
Merge into: ~ce-hyperscale/charms/+source/scalebot-jenkins:master
Diff against target: 38 lines (+6/-6)
2 files modified
README.md (+3/-3)
bin/pull-and-reload-jobs (+3/-3)
Reviewer Review Type Date Requested Status
Andrew Cloke Approve
Review via email: mp+374042@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andrew Cloke (andrew-cloke) wrote :

Agreed. The renaming makes sense.

Revision history for this message
Andrew Cloke (andrew-cloke) wrote :

Agreed. The renaming makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 4e8cfd6..43e5e2f 100644
3--- a/README.md
4+++ b/README.md
5@@ -67,7 +67,7 @@ labs/<labname>/clouds.yaml
6 labs/<labname>/credentials.yaml
7 labs/<labname>/model-defaults.yaml
8 scalebot.d/init
9-scalebot.d/mkjobs
10+scalebot.d/refresh
11 ```
12
13 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.
14@@ -88,5 +88,5 @@ In addition to the environment variables set by Jenkins, the following variable
15 ## scalebot.d/init hook
16 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.
17
18-## scalebot.d/mkjobs hook
19-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.
20+## scalebot.d/refresh hook
21+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.
22diff --git a/bin/pull-and-reload-jobs b/bin/pull-and-reload-jobs
23index 8a1775a..330f824 100755
24--- a/bin/pull-and-reload-jobs
25+++ b/bin/pull-and-reload-jobs
26@@ -10,9 +10,9 @@ set -x
27 [ -n "$SCALEBOT_REPO" ]
28
29 git -C ${SCALEBOT_REPO} pull --ff-only
30-mkjobs="${SCALEBOT_REPO}/scalebot.d/mkjobs"
31-if [ -x "$mkjobs" ]; then
32- $mkjobs
33+refresh="${SCALEBOT_REPO}/scalebot.d/refresh"
34+if [ -x "$refresh" ]; then
35+ $refresh
36 fi
37 jobsync="${SCALEBOT_HOME}/bin/jobsync.py"
38 ${jobsync} -j ${SCALEBOT_JOBSET} -s

Subscribers

People subscribed via source and target branches

to all changes: