Merge lp://staging/~psivaa/cupstream2distro-config/unity-scopes-api-thumbnailer-xenial into lp://staging/cupstream2distro-config

Proposed by Para Siva
Status: Merged
Approved by: Para Siva
Approved revision: 1329
Merged at revision: 1324
Proposed branch: lp://staging/~psivaa/cupstream2distro-config/unity-scopes-api-thumbnailer-xenial
Merge into: lp://staging/cupstream2distro-config
Prerequisite: lp://staging/~fginther/cupstream2distro-config/head-to-wily
Diff against target: 194 lines (+105/-47)
6 files modified
stacks/dev/services.cfg (+0/-16)
stacks/dev/thumbnailer.cfg (+34/-0)
stacks/head/services.cfg (+36/-0)
stacks/head/unity8.cfg (+35/-0)
stacks/wily/services.cfg (+0/-16)
stacks/wily/unity8.cfg (+0/-15)
To merge this branch: bzr merge lp://staging/~psivaa/cupstream2distro-config/unity-scopes-api-thumbnailer-xenial
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+275837@code.staging.launchpad.net

Commit message

unity-scopes-api and thumbnailer from wily to xenial

Description of the change

unity-scopes-api and thumbnailer from wily to xenial

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

In general, this is the right move. We need to completely remove any vivid content and shift these to xenial sections. There are a few things to correct as mentioned in the inline comments.

This wasn't mentioned in the request, but there is also a "lp:thumbnailer/devel" branch in stacks/dev/services.cfg that needs to be moved to vivid+xenial. I had a look at this and it would be a bit of a mess to move lp:thumbnailer/devel to xenial and keep the other projects in this file at the current release. So, I would recommend to just move the lp:thumbnailer/devel content to a new stacks/dev/thumbnailer.cfg file.

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

Also, please add "local_archive_pocket: xenial" to all of the xenial configurations. For example:

    configurations:
      xenial-armhf:
        node_label: calxeda-pbuilder
        local_archive_pocket: xenial
        archive_artifacts: '**/output/*deb'
      xenial-amd64:
        local_archive_pocket: xenial
        node_label: pbuilder
      xenial-i386:
        local_archive_pocket: xenial
        node_label: pbuilder

review: Needs Fixing
Revision history for this message
Para Siva (psivaa) wrote :

Thanks Francis, for the comments. I've addressed them. Would appreciate a re-review. Thanks

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

First I screwed up in my earlier comment when I wrote "We need to completely remove any vivid content". *Sigh*. That should have been "We need to completely remove any wily content". Sorry about that. I've made a comment to change those per-project build configurations back to vivid.

Also, I've found that when a project builds for multiple series, the "local_archive_pocket" value needs to be defined at the build configuration level. Otherwise, these will get added to the parent -ci job and the values will be overridden when jenkins runs the job.

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

Looks good. Thanks for iterating on this and fighting through my bad comments.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Para Siva (psivaa) wrote :

Thanks a lot Francis for the comments. I've just pushed an update for the second wave of comments and one that I missed in your first comment.

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

Siva, please remember to remove the thumbnailer section from stacks/dev/services.cfg now that it's in its own file. Otherwise this looks good.

review: Needs Fixing
1327. By Para Siva

No duplicate devel thumbnailer

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Approved

review: Approve
1328. By Para Siva

Make the spelling correct

1329. By Para Siva

Name of the file should match the stack name

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve

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

to all changes: