Merge lp:~didrocks/britney/additional-parameters into lp:~ubuntu-release/britney/britney2-ubuntu

Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 560
Proposed branch: lp:~didrocks/britney/additional-parameters
Merge into: lp:~ubuntu-release/britney/britney2-ubuntu
Diff against target: 42 lines (+25/-0)
1 file modified
run-autopkgtest (+25/-0)
To merge this branch: bzr merge lp:~didrocks/britney/additional-parameters
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+282015@code.launchpad.net

Commit message

Add new env, test-git and test-bzr parameters to run-autopkgtest

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'run-autopkgtest'
--- run-autopkgtest 2015-11-27 07:16:55 +0000
+++ run-autopkgtest 2016-01-08 15:04:29 +0000
@@ -32,6 +32,25 @@
32 default=[],32 default=[],
33 help='Enable PPA for requested test(s). '33 help='Enable PPA for requested test(s). '
34 'Can be specified multiple times.')34 'Can be specified multiple times.')
35 parser.add_argument('--env', metavar='KEY=VALUE', action='append',
36 default=[],
37 help='List of VAR=value strings. '
38 'This can be used to influence a test\'s behaviour '
39 'from a test request. '
40 'Can be specified multiple times.')
41 parser.add_argument('--test-git',
42 help='A single URL or URL branchname. '
43 'The test will be git cloned from that URL and ran '
44 'from the checkout. This will not build binary '
45 'packages from the branch and run tests against '
46 'those, the test dependencies will be taken from the '
47 'archive, or PPA if given. In this case the '
48 'srcpkgname will only be used for the result path in '
49 'swift and be irrelevant for the actual test.')
50 parser.add_argument('--test-bzr',
51 help='A single URL. '
52 'The test will be checked out with bzr from that URL. '
53 'Otherwise this has the same behaviour as test-git.')
35 parser.add_argument('package', nargs='+',54 parser.add_argument('package', nargs='+',
36 help='Source package name(s) whose tests to run.')55 help='Source package name(s) whose tests to run.')
37 args = parser.parse_args()56 args = parser.parse_args()
@@ -79,6 +98,12 @@
79 params['triggers'] = args.trigger98 params['triggers'] = args.trigger
80 if args.ppa:99 if args.ppa:
81 params['ppas'] = args.ppa100 params['ppas'] = args.ppa
101 if args.env:
102 params['env'] = args.env
103 if args.test_git:
104 params['test-git'] = args.test_git
105 if args.test_bzr:
106 params['test-bzr'] = args.test_bzr
82 params = '\n' + json.dumps(params)107 params = '\n' + json.dumps(params)
83108
84 creds = urllib.parse.urlsplit(config.adt_amqp, allow_fragments=False)109 creds = urllib.parse.urlsplit(config.adt_amqp, allow_fragments=False)

Subscribers

People subscribed via source and target branches