Merge lp:~psivaa/ci-core-jenkins/fetcher-fix into lp:ci-core-jenkins

Proposed by Para Siva
Status: Merged
Approved by: Para Siva
Approved revision: 20
Merged at revision: 18
Proposed branch: lp:~psivaa/ci-core-jenkins/fetcher-fix
Merge into: lp:ci-core-jenkins
Diff against target: 15 lines (+2/-3)
1 file modified
workers/fetch_latest_results/__init__.py (+2/-3)
To merge this branch: bzr merge lp:~psivaa/ci-core-jenkins/fetcher-fix
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Joe Talbott (community) Approve
Review via email: mp+262821@code.launchpad.net

Commit message

Fix for fetcher to pick the right tarball.

Description of the change

This change is needed since, to keep the jenkins job name consistent to be consumable by the dashboard, we need to give 'rolling_edge' as --channel arg during creating jobs. Not as 'edge' as the udf now prescribes.

http://q-jenkins.ubuntu-ci:8080/job/vivid-core_rolling_edge-genericamd64-smoke-selftest/49/ is with this change.

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote :

Looks good to me after discussing on IRC. Thank you.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

I remember how this works now. This project assumes that --channel is the combined 'release' + 'channel'. And the change to add a specific release was not right, it was missing the '_' to '-' replacement.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'workers/fetch_latest_results/__init__.py'
2--- workers/fetch_latest_results/__init__.py 2015-06-23 18:17:08 +0000
3+++ workers/fetch_latest_results/__init__.py 2015-06-24 10:37:08 +0000
4@@ -97,9 +97,8 @@
5 result_url = config.get(args.channel, 'result_url')
6 retry_count = int(config.get(args.channel, 'retry_count'))
7
8- container_name = "core-{}-{}-{}-{}".format(
9- 'rolling',
10- args.channel,
11+ container_name = "core-{}-{}-{}".format(
12+ args.channel.replace('_', '-'),
13 args.device,
14 args.image_id)
15 url = "{0}/{1}/{1}-results.tgz"

Subscribers

People subscribed via source and target branches