cupstream2distro Configuration

Merge lp:~psivaa/cupstream2distro-config/wily-mir-cfg into lp:cupstream2distro-config

  1. wily-mir-cfg
  2. Merge into trunk
Proposed by Para Siva
Status: Merged
Approved by: Para Siva
Approved revision: 1342
Merged at revision: 1341
Proposed branch: lp:~psivaa/cupstream2distro-config/wily-mir-cfg
Merge into: lp:cupstream2distro-config
Prerequisite: lp:~psivaa/cupstream2distro-config/mir-touch-standard
Diff against target: 70 lines (+28/-19)
2 files modified
stacks/wily/mir.cfg (+1/-19)
stacks/xenial/mir.cfg (+27/-0)
To merge this branch: bzr merge lp:~psivaa/cupstream2distro-config/wily-mir-cfg
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+280751@code.launchpad.net

Commit message

Wily mir config change.

Description of the change

Wily mir config change to match dev/mir.cfg

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1340
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/906/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-i386-ci/141

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cupstream2distro-config-ci/906/rebuild

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

The builds need to be moved from wily to xenial too (which may need a stacks/xenial/mir.cfg file). The series got out of sync when we moved lp:mir to xenial and this got left behind. This only applies to the lp:mir/ubuntu job configuration, the other projects in stacks/wily/mir.cfg can stay as is.

This also needs to keep "autolanding_template: False" in place. lp:mir/ubuntu is the branch managed by the ci-train and we don't want to have s-jenkins merging it.

review: Needs Fixing
lp:~psivaa/cupstream2distro-config/wily-mir-cfg updated
1341. By Para Siva

Move lp:mir/ubuntu xenial to sep stack

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

Thanks Francis. Would you mind re-reviewing it again please?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1341
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/907/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-i386-ci/142

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cupstream2distro-config-ci/907/rebuild

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

Just a couple of things that are missing in stacks/dev/mir.cfg. Otherwise this is good to go.

review: Needs Fixing
lp:~psivaa/cupstream2distro-config/wily-mir-cfg updated
1342. By Para Siva

Review comment fixes

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1342
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/908/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-i386-ci/143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cupstream2distro-config-ci/908/rebuild

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

Thanks for working to finish this. Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/wily/mir.cfg'
2--- stacks/wily/mir.cfg 2015-11-09 11:21:16 +0000
3+++ stacks/wily/mir.cfg 2015-12-17 20:38:20 +0000
4@@ -1,7 +1,7 @@
5 stack:
6 name: mir
7 series: wily
8- series-version: '15.04'
9+ series-version: '15.10'
10 ci_default:
11 hooks: H05set_package_version
12 configurations:
13@@ -14,24 +14,6 @@
14 distributions: wily
15 use_description_for_commit: True
16 projects:
17- mir:
18- target_branch: lp:mir/ubuntu
19- autolanding_template: False
20- local_archive_pocket: wily
21- contact_email: francis.ginther@canonical.com
22- hooks: H05set_package_version H10enable_coverage D09add_ppa~gcovr-team~ppa D10install_gcovr B10gcovr_run H15enable_testing D10install_valgrind B09copy_results C09copy_results
23- archive_artifacts: '**/*xml, **/output/*deb'
24- publish_coverage: '**/results/*coverage*.xml'
25- publish_junit: '**/results/*test*.xml'
26- build_timeout: 240
27- parallel_jobs: 2
28- standard_jobs: mir-clang-wily-amd64-build mir-clang-ts-wily-amd64-build mir-android-wily-i386-build
29- configurations:
30- wily-amd64:
31- node_label: pbuilder-mir
32- wily-armhf:
33- publish_junit: False
34- # TODO irc if autolanding fails
35 lightdm:
36 autolanding_template: False
37 local_archive_pocket: wily
38
39=== added directory 'stacks/xenial'
40=== added file 'stacks/xenial/mir.cfg'
41--- stacks/xenial/mir.cfg 1970-01-01 00:00:00 +0000
42+++ stacks/xenial/mir.cfg 2015-12-17 20:38:20 +0000
43@@ -0,0 +1,27 @@
44+stack:
45+ name: mir
46+ series: xenial
47+ series-version: '16.04'
48+ ci_default:
49+ hooks: H05set_package_version
50+ local_archive_pocket: xenial
51+ configurations:
52+ xenial-amd64:
53+ node_label: pbuilder
54+ xenial-i386:
55+ node_label: pbuilder-medium
56+ xenial-armhf:
57+ node_label: calxeda-pbuilder
58+ archive_artifacts: '**/output/*.deb'
59+ projects:
60+ mir:
61+ target_branch: lp:mir/ubuntu
62+ hooks: H05set_package_version D09add_ppa~mir-team~staging H10disable_mir_test_runs H15enable_testing D10install_valgrind B09copy_results C09copy_results D09add_ppa~ci-train-ppa-service~stable-phone-overlay
63+ archive_artifacts: '**/results/*.xml, **/output/*.deb'
64+ publish_junit: '**/results/*test*.xml'
65+ build_timeout: 240
66+ test_suite: mir_performance_tests mir_integration_tests mir_acceptance_tests mir_demo_client_basic mir_demo_client_fingerpaint mir_demo_client_eglflash mir_demo_client_eglplasma mir_demo_client_multiwin mir_demo_client_egltriangle mir_privileged_tests
67+ standard_jobs: mir-clang-vivid-amd64-build mir-android-vivid-i386-build mir-mediumtests-vivid-touch mir-mediumtests-xenial-touch
68+ configurations:
69+ xenial-armhf: False # the armhf build is part of mir-mediumtests-vivid-touch
70+ autolanding_template: False

Subscribers

People subscribed via source and target branches

to all changes: