Merge lp:~pwlars/auto-package-testing/use-touch-branch into lp:~canonical-ci-engineering/auto-package-testing/add-boottest-requests

Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 400
Merged at revision: 400
Proposed branch: lp:~pwlars/auto-package-testing/use-touch-branch
Merge into: lp:~canonical-ci-engineering/auto-package-testing/add-boottest-requests
Diff against target: 11 lines (+1/-1)
1 file modified
jenkins/jenkins_boottest_config.xml.tmpl (+1/-1)
To merge this branch: bzr merge lp:~pwlars/auto-package-testing/use-touch-branch
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+249426@code.launchpad.net

Commit message

Use lp:ubuntu-test-cases/touch for the branch to pull for boottest

Description of the change

Use lp:ubuntu-test-cases/touch for the branch to pull for boottest
Before merging this, make sure to merge:
https://code.launchpad.net/~canonical-ci-engineering/ubuntu-test-cases/boottest/+merge/249423

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve once the other branch lands.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jenkins/jenkins_boottest_config.xml.tmpl'
2--- jenkins/jenkins_boottest_config.xml.tmpl 2015-02-10 17:04:18 +0000
3+++ jenkins/jenkins_boottest_config.xml.tmpl 2015-02-11 22:36:41 +0000
4@@ -41,7 +41,7 @@
5 rm -Rf *
6
7 rm -r test-runner || true
8-setup_branch="lp:~canonical-ci-engineering/ubuntu-test-cases/boottest"
9+setup_branch="lp:ubuntu-test-cases/touch"
10 bzr_cmd="bzr branch $setup_branch test-runner"
11 $bzr_cmd || $bzr_cmd || $bzr_cmd
12

Subscribers

People subscribed via source and target branches