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
1
stack:
1
stack:
6
2
  name: mir
2
  name: mir
7
3
  series: wily
3
  series: wily
9
4
  series-version: '15.04'
4
  series-version: '15.10'
10
5
  ci_default:
5
  ci_default:
11
6
    hooks: H05set_package_version
6
    hooks: H05set_package_version
12
7
    configurations:
7
    configurations:
13
@@ -14,24 +14,6 @@
14
14
      distributions: wily
14
      distributions: wily
15
15
      use_description_for_commit: True
15
      use_description_for_commit: True
16
16
  projects:
16
  projects:
17
17
    mir:
18
18
      target_branch: lp:mir/ubuntu
19
19
      autolanding_template: False
20
20
      local_archive_pocket: wily
21
21
      contact_email: francis.ginther@canonical.com
22
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
23
      archive_artifacts: '**/*xml, **/output/*deb'
24
24
      publish_coverage: '**/results/*coverage*.xml'
25
25
      publish_junit: '**/results/*test*.xml'
26
26
      build_timeout: 240
27
27
      parallel_jobs: 2
28
28
      standard_jobs: mir-clang-wily-amd64-build mir-clang-ts-wily-amd64-build mir-android-wily-i386-build
29
29
      configurations:
30
30
        wily-amd64:
31
31
          node_label: pbuilder-mir
32
32
        wily-armhf:
33
33
          publish_junit: False
34
34
      # TODO irc if autolanding fails
35
35
    lightdm:
17
    lightdm:
36
36
      autolanding_template: False
18
      autolanding_template: False
37
37
      local_archive_pocket: wily
19
      local_archive_pocket: wily
38
38
20
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
1
stack:
45
2
  name: mir
46
3
  series: xenial
47
4
  series-version: '16.04'
48
5
  ci_default:
49
6
    hooks: H05set_package_version
50
7
    local_archive_pocket: xenial
51
8
    configurations:
52
9
      xenial-amd64:
53
10
        node_label: pbuilder
54
11
      xenial-i386:
55
12
        node_label: pbuilder-medium
56
13
      xenial-armhf:
57
14
        node_label: calxeda-pbuilder
58
15
        archive_artifacts: '**/output/*.deb'
59
16
  projects:
60
17
    mir:
61
18
      target_branch: lp:mir/ubuntu
62
19
      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
20
      archive_artifacts: '**/results/*.xml, **/output/*.deb'
64
21
      publish_junit: '**/results/*test*.xml'
65
22
      build_timeout: 240
66
23
      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
24
      standard_jobs: mir-clang-vivid-amd64-build mir-android-vivid-i386-build mir-mediumtests-vivid-touch mir-mediumtests-xenial-touch
68
25
      configurations:
69
26
        xenial-armhf: False # the armhf build is part of mir-mediumtests-vivid-touch
70
27
      autolanding_template: False
Status:	Merged
Approved by:	Para Siva on 2015-12-17
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Francis Ginther		2015-12-16	Approve on 2015-12-17
PS Jenkins bot	continuous-integration		Approve on 2015-12-17
Review via email: mp+280751@code.launchpad.net