juju-ci-tools

Merge lp:~veebers/juju-ci-tools/update-jenkins-no-conflicts into lp:juju-ci-tools

  1. update-jenkins-no-conflicts
  2. Merge into trunk
Proposed by Christopher Lee
Status: Merged
Merged at revision: 2011
Proposed branch: lp:~veebers/juju-ci-tools/update-jenkins-no-conflicts
Merge into: lp:juju-ci-tools
Diff against target: 13 lines (+2/-1)
1 file modified
update-jenkins-slave.bash (+2/-1)
To merge this branch: bzr merge lp:~veebers/juju-ci-tools/update-jenkins-no-conflicts
Reviewer Review Type Date Requested Status
Burton Swan (community) Approve
Review via email: mp+323650@code.launchpad.net

Commit message

When upgrading jenkins nodes, revert any changes made on the machines themselves.

Description of the change

When upgrading jenkins nodes, revert any changes made on the machines themselves.

Revert any changes so all merges are clean and there will be no conflicts. (no changes should be made on the machine anyway).

To post a comment you must log in.
Revision history for this message
Burton Swan (burton-swan) wrote :

Looks good for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'update-jenkins-slave.bash'
2--- update-jenkins-slave.bash 2017-04-11 13:49:23 +0000
3+++ update-jenkins-slave.bash 2017-05-04 23:12:26 +0000
4@@ -8,7 +8,8 @@
5 local_dir="$(basename $local_branch | cut -d ':' -f2)"
6 local_path="$HOME/$local_dir"
7 if [[ -d $local_path ]]; then
8- bzr pull -d $local_path
9+ # Clear any changes that haven't been commited to the branch.
10+ (cd $local_path; bzr revert; bzr pull)
11 else
12 bzr branch $local_branch $local_path
13 fi

Subscribers

People subscribed via source and target branches