Merge lp://staging/~doanac/ubuntu-ci-services-itself/bug1283870 into lp://staging/ubuntu-ci-services-itself

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 301
Merged at revision: 305
Proposed branch: lp://staging/~doanac/ubuntu-ci-services-itself/bug1283870
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 89 lines (+12/-12)
6 files modified
charms/precise/lander-jenkins/templates/jobs/lander_branch_source_builder.xml (+2/-2)
charms/precise/lander-jenkins/templates/jobs/lander_image_builder.xml (+2/-2)
charms/precise/lander-jenkins/templates/jobs/lander_ppa_assigner.xml (+2/-2)
charms/precise/lander-jenkins/templates/jobs/lander_ppa_free.xml (+2/-2)
charms/precise/lander-jenkins/templates/jobs/lander_publisher.xml (+2/-2)
charms/precise/lander-jenkins/templates/jobs/lander_test_runner.xml (+2/-2)
To merge this branch: bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/bug1283870
Reviewer Review Type Date Requested Status
Evan (community) Approve
Vincent Ladeuil (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+209124@code.staging.launchpad.net

Commit message

lander needs to escape backslash when echoing to file

The backslash isn't getting escaped and is causing the resulting json
file to be incorrect.

Description of the change

fixes the error i found with having backslashes in the ticket title/description

  https://bugs.launchpad.net/bugs/1283870

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:301
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/277/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/277/rebuild

review: Approve (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) wrote :

Good catch, too bad we can't fix that kind of bug in a single place. I'd love a long term solution that put less code in the jenkins jobs themselves.

review: Approve
Revision history for this message
Evan (ev) wrote :

Only nit is that this form would be slightly more readable:

's,\\,\\\\,g'

But that's just my preference. +1

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

On 03/04/2014 03:06 AM, Vincent Ladeuil wrote:
> Good catch, too bad we can't fix that kind of bug in a single place. I'd love a long term solution that put less code in the jenkins jobs themselves.

There actually is a way to do it, but it would convert all our lander
jobs into a single job. Francis and chatted about doing that, but
thought it would make debugging even more difficult. I suspect this type
of stuff is all going away post phase-0, so I'll just keep limping it
along for now.

I do agree - fixes like this make me nervous cause its so easy to forget
to forget to update a file.

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Andy Doan <email address hidden> writes:

    > On 03/04/2014 03:06 AM, Vincent Ladeuil wrote:
    >> Good catch, too bad we can't fix that kind of bug in a single place. I'd love a long term solution that put less code in the jenkins jobs themselves.

    > There actually is a way to do it, but it would convert all our lander
    > jobs into a single job.

Not sure I follow. What I mean is having jenkins jobs call shell our
python scripts and have the smarts in those scripts so we touch
the jenkins templates less often.

    > Francis and chatted about doing that, but thought it would make
    > debugging even more difficult.

At least we would be able to test the scripts themselves without
involving jenkins ?

    > I suspect this type of stuff is all going away post phase-0, so
    > I'll just keep limping it along for now.

/me nods

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches