Merge lp:~roadmr/checkbox/1306793-fix-requirements-job into lp:checkbox

Proposed by Daniel Manrique
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3057
Merged at revision: 3061
Proposed branch: lp:~roadmr/checkbox/1306793-fix-requirements-job
Merge into: lp:checkbox
Diff against target: 37 lines (+18/-1)
1 file modified
providers/plainbox-provider-resource-generic/jobs/resource.txt (+18/-1)
To merge this branch: bzr merge lp:~roadmr/checkbox/1306793-fix-requirements-job
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+222658@code.launchpad.net

Commit message

    provider:resource: Fixed command and improved description for requirement job

    Requirement job will now only fail if it actually has trouble reading
    the requirements file.

    The documentation (in the job's description) was expanded to make it
    clearer.

Description of the change

    provider:resource: Fixed command and improved description for requirement job

    Requirement job will now only fail if it actually has trouble reading
    the requirements file.

    The documentation (in the job's description) was expanded to make it
    clearer.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-resource-generic/jobs/resource.txt'
2--- providers/plainbox-provider-resource-generic/jobs/resource.txt 2014-04-08 19:49:46 +0000
3+++ providers/plainbox-provider-resource-generic/jobs/resource.txt 2014-06-10 14:06:32 +0000
4@@ -183,15 +183,32 @@
5 id: requirements
6 estimated_duration: 0.01
7 plugin: resource
8-command: [ -f $PLAINBOX_SESSION_SHARE/requirements_docs.txt ] && cat $PLAINBOX_SESSION_SHARE/requirements_docs.txt
9+command:
10+ if [ -f $PLAINBOX_SESSION_SHARE/requirements_docs.txt ];then
11+ cat $PLAINBOX_SESSION_SHARE/requirements_docs.txt
12+ else
13+ true
14+ fi
15 _description:
16 Provide links to requirements documents.
17 .
18+ The requirement document should contain sets of name/link pairs.
19+ .
20 Each requirement should have two keys with their respective
21 values:
22 name: (to be used as the anchor text)
23 link: (the actual URL)
24 .
25+ Each set should be separated from the previous one by a new line.
26+ .
27+ Example:
28+ .
29+ name: Requirement 1
30+ link: http://example.com/requirement1
31+ .
32+ name: requirement 2
33+ link: http://example.com/requirement2
34+ .
35 Providers wishing to use this feature need to:
36 1- Write a job that places a suitably-formatted file in $PLAINBOX_SESSION_SHARE
37 2- Update their whitelists to run that job *before* miscellanea/submission-resources

Subscribers

People subscribed via source and target branches