From bc184a6b06a6a24bc8604b578360938dfa690863 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 10:51:48 -0700 Subject: [PATCH 01/26] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2eb9855434b9 Author: Dave Hunt Desc: Bug 1136122 - Separate host and device SMTP account details. r=gmealer --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 453870f538bd..c16458cd36a0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d4177902b04b8fedcb7df9a30ae6e9677e03d2d4", + "git_revision": "4a5a2ce14f9c62adc72b43e60aa69ef0c93e8491", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "23ffbbdd387271d8b8b94f4ce60ccb17ad6c5b10", + "revision": "2eb9855434b9cc4d6995b39a9302cda6bd8e34d6", "repo_path": "integration/gaia-central" } From 144776a45ef2c26a460014cb17139401ba59ba15 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 10:54:23 -0700 Subject: [PATCH 02/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 38b3e4602a80..681da2d276a3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index efc4fa7249ed..3169320bb04d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 404366723d16..a0f3d4d95e58 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 786c72216eac..bc4e153e2de4 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index a3572549b1ed..224b64c65b5c 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index efc4fa7249ed..3169320bb04d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 18c157576709..083d7451de00 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index ffa0ce79f2de..82f470c18277 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bb777d59499c..1ebb1c62717f 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index bb37a5b2c747..1b399d2dda2b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b2d0648a8b27281d6434eef6e3cbd12a27172fa6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 11:21:50 -0700 Subject: [PATCH 03/26] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3f59e9415167 Author: autolander Desc: Bug 1140322 - merge pull request #28847 from punamdahiya:Bug1140322 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/d05b4a95b55a Author: Punam Dahiya Desc: Bug 1140322 - [RTL][Wallpaper] Change wallpaper grid view should be mirrored r=djf. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c16458cd36a0..379d16b81e50 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4a5a2ce14f9c62adc72b43e60aa69ef0c93e8491", + "git_revision": "25a9092ffee8035bc486e1476fe79f5dd4493ea8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "2eb9855434b9cc4d6995b39a9302cda6bd8e34d6", + "revision": "3f59e9415167da233aacd1112a54642314c9d5aa", "repo_path": "integration/gaia-central" } From d2f56c3c5e156dbcbef74aadacf3d0a5050ceda1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 11:24:44 -0700 Subject: [PATCH 04/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 681da2d276a3..663eaceec1b6 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3169320bb04d..9cf7b057193e 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a0f3d4d95e58..dcd69e33fcb7 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index bc4e153e2de4..c1e7ecac20a2 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 224b64c65b5c..25276cbdddf4 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 3169320bb04d..9cf7b057193e 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 083d7451de00..01782d15be3b 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 82f470c18277..7a82f941cc6e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 1ebb1c62717f..900902fe21e1 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 1b399d2dda2b..4dd547098277 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From a9fed9bd1305f05dab94683b612b19b08e8f3d9d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 12:09:09 -0700 Subject: [PATCH 05/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 663eaceec1b6..11e8ed62402b 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9cf7b057193e..fb18fa484d38 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index dcd69e33fcb7..d586c89c66d8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index c1e7ecac20a2..43da7e4984f0 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 25276cbdddf4..8f4cd8487834 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9cf7b057193e..fb18fa484d38 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 01782d15be3b..5f1f6dfaf7b9 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 7a82f941cc6e..809771a3b01e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 900902fe21e1..c28c54929cd5 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 4dd547098277..37590c748545 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -23,7 +23,7 @@ - + From 9eeb52b6e92f17b3c5f75cbc75c6321baa5fa9ef Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 12:25:22 -0700 Subject: [PATCH 06/26] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5ea86c5ae5de Author: tamarahills Desc: Merge pull request #28823 from tamarahills/bugfix/1141891-add-suggestion-search Bug 1141891 - Add Metrics Search to count selected suggested searches by... ======== https://hg.mozilla.org/integration/gaia-central/rev/d843d5f6918e Author: Tamara Hills Desc: Bug 1141891 - Add Metrics Search to count selected suggested searches by a user. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 379d16b81e50..861e20249401 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "25a9092ffee8035bc486e1476fe79f5dd4493ea8", + "git_revision": "db48e2353effeb3e3f74dda7b9103ee7ce8bbfde", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3f59e9415167da233aacd1112a54642314c9d5aa", + "revision": "5ea86c5ae5de8946c97dea2764d04e18cd7d1dbf", "repo_path": "integration/gaia-central" } From d278bc29ebbae5df9bd30cf064fbb6f1de6972a4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 12:27:54 -0700 Subject: [PATCH 07/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 11e8ed62402b..69ffd131eb4a 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fb18fa484d38..85bf531ad3d2 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d586c89c66d8..4c229a3a1591 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 43da7e4984f0..88e48da22adc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 8f4cd8487834..70e0f0c4a8bc 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index fb18fa484d38..85bf531ad3d2 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 5f1f6dfaf7b9..980976ed5e87 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 809771a3b01e..dc825f7d17ee 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index c28c54929cd5..86c5a61d55a0 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 37590c748545..7f04424514a8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ed605875f4ee3b8a44ab4654e8d63b78c8b92b2e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 12:46:48 -0700 Subject: [PATCH 08/26] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0d8b4c68c4d7 Author: Ryan VanderMeulen Desc: Revert "Bug 1136122 - Separate host and device SMTP account details. r=gmealer" This reverts commit 4a5a2ce14f9c62adc72b43e60aa69ef0c93e8491. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 861e20249401..30e8a6b360ae 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "db48e2353effeb3e3f74dda7b9103ee7ce8bbfde", + "git_revision": "badb868646def35a2bbe5e022428e78da721f81e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "5ea86c5ae5de8946c97dea2764d04e18cd7d1dbf", + "revision": "0d8b4c68c4d7ae4d241140d299b7dbd72ce328c0", "repo_path": "integration/gaia-central" } From fb4767b54d96e2dbd6225dbdde268a4d90c159f0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 12:49:17 -0700 Subject: [PATCH 09/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 69ffd131eb4a..8479b066ca9f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 85bf531ad3d2..8c11e2476b77 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4c229a3a1591..b80dea7b0ea0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 88e48da22adc..760538fee8fc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 70e0f0c4a8bc..9f77e0f90c6f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 85bf531ad3d2..8c11e2476b77 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 980976ed5e87..84d333c98e02 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index dc825f7d17ee..201964c6b658 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 86c5a61d55a0..5a869af65aa0 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 7f04424514a8..a547bf60c587 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 2ca33cf1a1d6c95921d4d68bff956b19d7e633f8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 16:20:19 -0700 Subject: [PATCH 10/26] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/81e40f8fa222 Author: Russ Nicoletti Desc: Merge pull request #28846 from russnicoletti/bug-1141559 Bug 1141559 - update time while seeking r=djf ======== https://hg.mozilla.org/integration/gaia-central/rev/1b09a6979e7c Author: Russ Nicoletti Desc: bug 1141559 -- update time while seeking ======== https://hg.mozilla.org/integration/gaia-central/rev/3227a38ba156 Author: autolander Desc: Bug 1068701 - merge pull request #28872 from yzen:bug-1068701 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/2682351657b0 Author: Yura Zenevich Desc: Bug 1068701 - adding semantics around loading more messages UI. Making sure when more messages are loaded screen reader focuses on the first newly added message. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 30e8a6b360ae..ea1160b05ef4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "badb868646def35a2bbe5e022428e78da721f81e", + "git_revision": "3e17ba1ac689c0c1746300f9e13efc9db59c46df", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "0d8b4c68c4d7ae4d241140d299b7dbd72ce328c0", + "revision": "81e40f8fa2228ad5802768e2942237c992653381", "repo_path": "integration/gaia-central" } From fe6405201038f923c82a8d2815ebffdbde87b421 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 16:22:50 -0700 Subject: [PATCH 11/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 8479b066ca9f..ffff2d570145 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8c11e2476b77..4341d3542d08 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index b80dea7b0ea0..05719f9ceaf3 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 760538fee8fc..ef9190ce3165 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 9f77e0f90c6f..6079ca71a450 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 8c11e2476b77..4341d3542d08 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 84d333c98e02..9bf5f0f47e92 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 201964c6b658..893b65bdb6be 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 5a869af65aa0..56336c9db5c9 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a547bf60c587..650971c37160 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 2a6662a51ba166588621744ab66dad8ae931efdb Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 14:12:35 -0700 Subject: [PATCH 12/26] Bug 1143054 - Display emulator-jb on production treeherder r=me a=taskcluster-only --HG-- extra : source : 50c4d150653dec8a1d39d6a3a4ee449e0c5b661f --- testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml index a3afbb6d369f..b2552df0b02d 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml @@ -5,10 +5,12 @@ task: scopes: - 'docker-worker:cache:workspace-emulator-jb-debug' metadata: - name: '[TC] B2G Emulator JB Debug' + name: '[TC] B2G Emulator JB: (Debug)' extra: + # Disable "TC" prefix... treeherder: + groupSymbol: "?" collection: debug: true machine: diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml index 94c2815fbd43..8fa8b1c2a583 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml @@ -5,10 +5,15 @@ task: scopes: - 'docker-worker:cache:workspace-emulator-jb-opt' metadata: - name: '[TC] B2G JB Emulator Opt' + name: '[TC] B2G JB Emulator: (Opt)' extra: + treeherderEnv: + - production + - staging + # Disable "TC" prefix... treeherder: + groupSymbol: "?" machine: platform: b2g-emu-jb From e47a2899534ebdad2abdf03c915526d048f2beb7 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 11:11:22 -0700 Subject: [PATCH 13/26] Bug 1143052 - Display emulator-kk on production treeherder r=me a=taskcluster-only --HG-- extra : source : e207176099a6da0714627184b829c6a001fae7ea --- testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml | 7 ++++++- testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml index 55aa0369cbfa..7a4373b237d3 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml @@ -5,10 +5,15 @@ task: scopes: - 'docker-worker:cache:workspace-emulator-kk-debug' metadata: - name: '[TC] B2G Emulator KK Debug' + name: '[TC] B2G Emulator KK (Debug)' extra: + treeherderEnv: + - production + - staging treeherder: + # Disable "TC" prefix... + groupSymbol: "?" collection: debug: true machine: diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml index e28ad159c5d1..e9fca4c86fff 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml @@ -5,10 +5,15 @@ task: scopes: - 'docker-worker:cache:workspace-emulator-kk-opt' metadata: - name: '[TC] B2G KK Emulator Opt' + name: '[TC] B2G KK Emulator (Opt)' extra: + treeherderEnv: + - production + - staging treeherder: + # Disable "TC" prefix... + groupSymbol: "?" machine: platform: b2g-emu-kk From 1ebdedca270146f3c5afd5881ef0d68174103838 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 20:01:06 -0700 Subject: [PATCH 14/26] Bug 1142565 - Update tester images to include same fonts as test slaves r=garndt --HG-- extra : rebase_source : 44ce3e45d009f539847dbcabbc5e014ba616211c extra : source : 254214c968f1eb01b74074a153b8ba0af6066ce2 extra : histedit_source : 13f9ee5c0130f655650ec6e756515ed3a5a91d73%2Cb1b10f0bff4b0d320e45031942268db07916ec39 --- testing/docker/base-test/Dockerfile | 121 +++++++++++++++++- testing/docker/base-test/VERSION | 2 +- testing/docker/base-test/system-setup.sh | 149 ----------------------- testing/docker/tester/Dockerfile | 4 +- testing/docker/tester/VERSION | 2 +- testing/docker/tester/bin/entrypoint | 1 + 6 files changed, 122 insertions(+), 157 deletions(-) delete mode 100755 testing/docker/base-test/system-setup.sh diff --git a/testing/docker/base-test/Dockerfile b/testing/docker/base-test/Dockerfile index 3b73ea452669..fb58f81b257e 100644 --- a/testing/docker/base-test/Dockerfile +++ b/testing/docker/base-test/Dockerfile @@ -1,9 +1,122 @@ FROM quay.io/mozilla/ubuntu:12.04 MAINTAINER Jonas Finnemann Jensen -# Run system setup script -ADD system-setup.sh /tmp/system-setup.sh -RUN ["/tmp/system-setup.sh"] + +COPY sources.list /etc/apt/sources.list + +RUN useradd -d /home/worker -s /bin/bash -m worker +RUN apt-get update && apt-get install -y --force-yes \ + alsa-base \ + alsa-utils \ + autoconf2.13 \ + bluez-alsa \ + bluez-alsa:i386 \ + bluez-cups \ + bluez-gstreamer \ + build-essential \ + ca-certificates \ + ccache \ + curl \ + fonts-kacst \ + fonts-kacst-one \ + fonts-liberation \ + fonts-stix \ + fonts-unfonts-core \ + fonts-unfonts-extra \ + fonts-vlgothic \ + g++-multilib \ + gcc-multilib \ + gir1.2-gnomebluetooth-1.0 \ + git \ + gstreamer0.10-alsa \ + gstreamer0.10-ffmpeg \ + gstreamer0.10-plugins-bad \ + gstreamer0.10-plugins-base \ + gstreamer0.10-plugins-good \ + gstreamer0.10-plugins-ugly \ + gstreamer0.10-tools \ + libasound2-dev \ + libasound2-plugins:i386 \ + libcanberra-pulse \ + libcurl4-openssl-dev \ + libdbus-1-dev \ + libdbus-glib-1-dev \ + libdrm-intel1:i386 \ + libdrm-nouveau1a:i386 \ + libdrm-radeon1:i386 \ + libdrm2:i386 \ + libexpat1:i386 \ + libgconf2-dev \ + libgl1-mesa-dri \ + libgl1-mesa-dri:i386 \ + libgl1-mesa-glx \ + libgl1-mesa-glx:i386 \ + libglapi-mesa \ + libglapi-mesa:i386 \ + libglu1-mesa \ + libglu1-mesa:i386 \ + libgnome-bluetooth8 \ + libgstreamer-plugins-base0.10-dev \ + libgstreamer0.10-dev \ + libgtk2.0-dev \ + libiw-dev \ + libllvm2.9 \ + libllvm3.0:i386 \ + libncurses5:i386 \ + libnotify-dev \ + libpulse-dev \ + libpulse-mainloop-glib0:i386 \ + libpulsedsp:i386 \ + libsdl1.2debian:i386 \ + libsox-fmt-alsa \ + libx11-xcb1:i386 \ + libxcb-glx0 \ + libxcb-glx0:i386 \ + libxdamage1:i386 \ + libxfixes3:i386 \ + libxt-dev \ + libxxf86vm1 \ + libxxf86vm1:i386 \ + llvm \ + llvm-2.9 \ + llvm-2.9-dev \ + llvm-2.9-runtime \ + llvm-dev \ + llvm-runtime \ + mercurial \ + mesa-common-dev \ + nano \ + pulseaudio \ + pulseaudio-module-X11 \ + pulseaudio-module-bluetooth \ + pulseaudio-module-gconf \ + python-dev \ + python-pip \ + rlwrap \ + screen \ + software-properties-common \ + sudo \ + tar \ + ttf-arphic-uming \ + ttf-dejavu \ + ttf-indic-fonts-core \ + ttf-kannada-fonts \ + ttf-oriya-fonts \ + ttf-paktype \ + ttf-punjabi-fonts \ + ttf-sazanami-mincho \ + unzip \ + uuid \ + vim \ + wget \ + xvfb \ + yasm \ + zip + +ENV NODE_VERSION v0.10.36 +RUN cd /usr/local/ && \ + curl https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz | tar -xz --strip-components 1 && \ + node -v # Set variable normally configured at login, by the shells parent process, these # are taken from GNU su manual @@ -14,6 +127,6 @@ ENV LOGNAME worker # Declare default working folder WORKDIR /home/worker - + # Set a default command useful for debugging CMD ["/bin/bash", "--login"] diff --git a/testing/docker/base-test/VERSION b/testing/docker/base-test/VERSION index 8acdd82b765e..bbdeab6222cb 100644 --- a/testing/docker/base-test/VERSION +++ b/testing/docker/base-test/VERSION @@ -1 +1 @@ -0.0.1 +0.0.5 diff --git a/testing/docker/base-test/system-setup.sh b/testing/docker/base-test/system-setup.sh deleted file mode 100755 index a5e15586e20a..000000000000 --- a/testing/docker/base-test/system-setup.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/bash -ve - -################################### setup.sh ################################### - -### Check that we are running as root -test `whoami` == 'root'; - -### Add worker user -# Minimize the number of things which the build script can do, security-wise -# it's not a problem to let the build script install things with apt-get. But it -# really shouldn't do this, so let's forbid root access. -useradd -d /home/worker -s /bin/bash -m worker; - -### Install Useful Packages -# First we update and upgrade to latest versions. -apt-get update; -apt-get upgrade -y; - -# Let's install some goodies, ca-certificates is needed for https with hg. -# sudo will be required anyway, but let's make it explicit. It nice to have -# sudo around. We'll also install nano, this is pure bloat I know, but it's -# useful a text editor. -apt-get install -y \ - ca-certificates \ - sudo \ - nano \ - tar \ - ; - -# Then let's install all firefox build dependencies, this are extracted from -# mozboot. See python/mozboot/bin/bootstrap.py in mozilla-central. -apt-get install -y \ - autoconf2.13 \ - build-essential \ - ccache \ - libasound2-dev \ - libcurl4-openssl-dev \ - libdbus-1-dev \ - libdbus-glib-1-dev \ - libgconf2-dev \ - libgstreamer0.10-dev \ - libgstreamer-plugins-base0.10-dev \ - libgtk2.0-dev \ - libiw-dev \ - libnotify-dev \ - libpulse-dev \ - libxt-dev \ - mercurial \ - git \ - mesa-common-dev \ - python-dev \ - unzip \ - uuid \ - yasm \ - xvfb \ - zip \ - software-properties-common \ - ; - -### Firefox Test Setup -apt-get install -y \ - alsa-base \ - alsa-utils \ - bluez-alsa \ - bluez-alsa:i386 \ - bluez-cups \ - bluez-gstreamer \ - g++-multilib \ - gcc-multilib \ - gir1.2-gnomebluetooth-1.0 \ - gstreamer0.10-alsa \ - libasound2-plugins:i386 \ - libcanberra-pulse \ - libdrm-intel1:i386 \ - libdrm-nouveau1a:i386 \ - libdrm-radeon1:i386 \ - libdrm2:i386 \ - libexpat1:i386 \ - libgnome-bluetooth8 \ - libllvm2.9 \ - libllvm3.0:i386 \ - libncurses5:i386 \ - libpulse-mainloop-glib0:i386 \ - libpulsedsp:i386 \ - libsdl1.2debian:i386 \ - libsox-fmt-alsa \ - libx11-xcb1:i386 \ - libxcb-glx0:i386 \ - libxcb-glx0 \ - libxdamage1:i386 \ - libxfixes3:i386 \ - libxxf86vm1:i386 \ - libxxf86vm1 \ - llvm \ - llvm-2.9 \ - llvm-2.9-dev \ - llvm-2.9-runtime \ - llvm-dev \ - llvm-runtime \ - pulseaudio-module-bluetooth \ - pulseaudio-module-gconf \ - pulseaudio-module-X11 \ - pulseaudio \ - python-pip - -# Install some utilities -curl -sL https://deb.nodesource.com/setup | sudo bash - -apt-get install -y \ - screen \ - vim \ - wget \ - curl \ - rlwrap \ - nodejs \ - ; - -# Mozilla-patched mesa libs required for many reftests -- see bug 975034 -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_amd64.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_amd64.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb - -# Install releng package of nodejs that includes npm -#wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/precise/pool/main/n/nodejs/nodejs_0.10.21-1chl1~precise1_amd64.deb -#dpkg -i nodejs_0.10.21-1chl1~precise1_amd64.deb - -### Clean up from setup -# Remove cached .deb packages. Cached package takes up a lot of space and -# distributing them to workers is wasteful. -apt-get clean -rm *.deb - -# Remove the setup.sh setup, we don't really need this script anymore, deleting -# it keeps the image as clean as possible. -rm $0; echo "Deleted $0"; - -################################### setup.sh ################################### diff --git a/testing/docker/tester/Dockerfile b/testing/docker/tester/Dockerfile index b3d0dbfe5b0d..16d347c72754 100644 --- a/testing/docker/tester/Dockerfile +++ b/testing/docker/tester/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/mozilla/base-test:0.0.1 +FROM quay.io/mozilla/base-test:0.0.5 MAINTAINER Jonas Finnemann Jensen # Add utilities and configuration @@ -13,7 +13,7 @@ ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/maste # Run test setup script RUN chmod u+x /home/worker/bin/buildbot_step -RUN pip install virtualenv; +RUN apt-get install -y python-pip && pip install virtualenv; RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts RUN chown -R worker:worker /home/worker/* /home/worker/.* RUN npm install -g taskcluster-vcs@2.3.1 diff --git a/testing/docker/tester/VERSION b/testing/docker/tester/VERSION index ceddfb28f4ff..3a4036fb450f 100644 --- a/testing/docker/tester/VERSION +++ b/testing/docker/tester/VERSION @@ -1 +1 @@ -0.0.15 +0.2.5 diff --git a/testing/docker/tester/bin/entrypoint b/testing/docker/tester/bin/entrypoint index f06f537e7535..6f8417602acc 100755 --- a/testing/docker/tester/bin/entrypoint +++ b/testing/docker/tester/bin/entrypoint @@ -10,6 +10,7 @@ test $MOZHARNESS_REV # mozharness revision # XXX: Note that all tests could be faster at smaller bit depth Xvfb :0 -nolisten tcp -screen 0 1600x1200x24 2>/dev/null & + export DISPLAY=:0 # First check if the mozharness directory is available. This is intended to be From 92691c761198f5f8b1ec35517b6339dc49ca18d0 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 19:52:57 -0700 Subject: [PATCH 15/26] Bug 1143069 - Add symbol to task graph for branch configs r=garndt --HG-- extra : source : 5f763e42e6b48e15acee79e7b299f45225a3a4e3 --- testing/taskcluster/tasks/decision/branch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/taskcluster/tasks/decision/branch.yml b/testing/taskcluster/tasks/decision/branch.yml index a292af45b38f..62992af39b26 100644 --- a/testing/taskcluster/tasks/decision/branch.yml +++ b/testing/taskcluster/tasks/decision/branch.yml @@ -16,6 +16,8 @@ tasks: - taskId: '{{#as_slugid}}decision task{{/as_slugid}}' reruns: 3 task: + routes: + - tc-treeherder-stage.{{project}}.{{revision_hash}} created: '{{now}}' deadline: '{{#from_now}}1 day{{/from_now}}' metadata: From b494de76aed6d7f97082d6ba3f09fc0c17047cc3 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 19:53:42 -0700 Subject: [PATCH 16/26] Bug 1140551 - Move all chunk configs into tasks instead of branch configs r=garndt --HG-- extra : source : defdbd97fae6932c850b9577b9acb4697c9fa265 --- .../tasks/branches/mozilla-central/job_flags.yml | 9 --------- .../taskcluster/tasks/branches/try/job_flags.yml | 15 --------------- testing/taskcluster/tasks/test.yml | 3 +++ .../tasks/tests/b2g_emulator_crashtest.yml | 3 +++ .../tasks/tests/b2g_emulator_mochitest.yml | 2 ++ .../tasks/tests/b2g_emulator_reftest.yml | 2 ++ .../tasks/tests/b2g_emulator_xpcshell_chunked.yml | 2 ++ .../tasks/tests/b2g_gaia_js_integration_tests.yml | 2 ++ .../tasks/tests/b2g_gaia_ui_test_functional.yml | 3 +++ .../tests/mulet_gaia_js_integration_tests.yml | 2 ++ .../taskcluster/tasks/tests/mulet_mochitests.yml | 3 ++- .../taskcluster/tasks/tests/mulet_reftests.yml | 2 ++ 12 files changed, 23 insertions(+), 25 deletions(-) diff --git a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml index 26a693850a69..e027717fa473 100644 --- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml +++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml @@ -56,7 +56,6 @@ tests: allowed_build_tasks: tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_crashtest.yml - chunks: 3 gaia-build: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -69,7 +68,6 @@ tests: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_gaia_js_integration_tests.yml - chunks: 4 gaia-linter: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -84,10 +82,8 @@ tests: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_gaia_ui_test_functional.yml - chunks: 3 tasks/builds/b2g_desktop_debug.yml: task: tasks/tests/b2g_gaia_ui_test_functional.yml - chunks: 3 gaia-ui-test-unit: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -113,7 +109,6 @@ tests: chunks: 9 tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_mochitest.yml - chunks: 20 tasks/builds/mulet_linux.yml: task: tasks/tests/mulet_mochitests.yml chunks: 5 @@ -121,21 +116,17 @@ tests: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_mochitest_oop.yml - chunks: 1 reftest: allowed_build_tasks: tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_reftest.yml - chunks: 20 reftest-sanity-oop: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_reftests_sanity_oop.yml - chunks: 1 xpcshell: allowed_build_tasks: tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_xpcshell.yml tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_xpcshell_chunked.yml - chunks: 2 diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index 78dda24a20fe..9f5c3d6e5cc5 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -68,7 +68,6 @@ tests: allowed_build_tasks: tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_crashtest.yml - chunks: 3 gaia-build: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -81,10 +80,8 @@ tests: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_gaia_js_integration_tests.yml - chunks: 10 tasks/builds/mulet_linux.yml: task: tasks/tests/mulet_gaia_js_integration_tests.yml - chunks: 10 gaia-linter: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -99,10 +96,8 @@ tests: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_gaia_ui_test_functional.yml - chunks: 3 tasks/builds/b2g_desktop_debug.yml: task: tasks/tests/b2g_gaia_ui_test_functional.yml - chunks: 3 gaia-ui-test-unit: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -129,40 +124,31 @@ tests: allowed_build_tasks: tasks/builds/b2g_emulator_kk_debug.yml: task: tasks/tests/b2g_emulator_mochitest.yml - chunks: 20 tasks/builds/b2g_emulator_kk_opt.yml: task: tasks/tests/b2g_emulator_mochitest.yml - chunks: 20 tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_mochitest.yml chunks: 9 tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_mochitest.yml - chunks: 20 tasks/builds/mulet_linux.yml: task: tasks/tests/mulet_mochitests.yml - chunks: 5 mochitest-oop: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_mochitest_oop.yml - chunks: 1 reftest: allowed_build_tasks: tasks/builds/mulet_linux.yml: task: tasks/tests/mulet_reftests.yml - chunks: 6 tasks/builds/b2g_emulator_kk_opt.yml: task: tasks/tests/b2g_emulator_reftest.yml - chunks: 20 tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_reftest.yml - chunks: 20 reftest-sanity-oop: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: task: tasks/tests/b2g_reftests_sanity_oop.yml - chunks: 1 xpcshell: allowed_build_tasks: tasks/builds/b2g_emulator_kk_opt.yml: @@ -171,4 +157,3 @@ tests: task: tasks/tests/b2g_emulator_xpcshell.yml tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_xpcshell_chunked.yml - chunks: 2 diff --git a/testing/taskcluster/tasks/test.yml b/testing/taskcluster/tasks/test.yml index b6679dd324b6..144a37c688ef 100644 --- a/testing/taskcluster/tasks/test.yml +++ b/testing/taskcluster/tasks/test.yml @@ -42,6 +42,9 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 1 + current: {{chunk}} treeherder: groupSymbol: tc groupName: Submitted by taskcluster diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml index 2032c5b5e8dd..7b995c81aff6 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml @@ -28,6 +28,9 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 3 + treeherder: groupName: Reftest groupSymbol: tc-R diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml index 47df38d94838..14dda26fd9f0 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml @@ -29,6 +29,8 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 20 treeherder: groupName: Mochitest groupSymbol: tc-M diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml index 863b445668c4..6993bd181990 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml @@ -27,6 +27,8 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 20 treeherder: groupName: Reftest groupSymbol: tc-R diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml index f0de7d1c707a..43496f3f34c7 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml @@ -28,6 +28,8 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 2 treeherder: groupName: XPCShell symbol: X{{chunk}} diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml index b074490b559b..83450341ea55 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml @@ -29,6 +29,8 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 10 treeherder: groupName: Gaia JS Integration Test groupSymbol: tc-Gij diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml index adcda24f4ad5..a711c6ff63bd 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml @@ -31,6 +31,9 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 3 + treeherder: groupName: Gaia Python Integration Tests groupSymbol: tc-Gip diff --git a/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml b/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml index df43e3e8d8eb..683e9896955d 100644 --- a/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml +++ b/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml @@ -30,6 +30,8 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 10 treeherder: groupName: Gaia JS Integration Test groupSymbol: tc-Gij diff --git a/testing/taskcluster/tasks/tests/mulet_mochitests.yml b/testing/taskcluster/tasks/tests/mulet_mochitests.yml index 913f95cb1411..f8dfb9e6ee64 100644 --- a/testing/taskcluster/tasks/tests/mulet_mochitests.yml +++ b/testing/taskcluster/tasks/tests/mulet_mochitests.yml @@ -27,8 +27,9 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 5 treeherder: groupSymbol: tc-M groupName: Mulet mochitests symbol: {{chunk}} - diff --git a/testing/taskcluster/tasks/tests/mulet_reftests.yml b/testing/taskcluster/tasks/tests/mulet_reftests.yml index 32ab765c6471..af8419744612 100644 --- a/testing/taskcluster/tasks/tests/mulet_reftests.yml +++ b/testing/taskcluster/tasks/tests/mulet_reftests.yml @@ -33,6 +33,8 @@ task: expires: '{{#from_now}}1 year{{/from_now}}' extra: + chunks: + total: 6 treeherder: groupName: Reftest groupSymbol: tc-R From 17f4a896ce22eaa5e595dfa2a51a59875affa962 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 19:54:22 -0700 Subject: [PATCH 17/26] Bug 1140551 - Add support for setting number of test chunks in task directly r=garndt --HG-- extra : source : 24fe237ad9becddf95faa9d7d2aad78f4495298b --- testing/taskcluster/mach_commands.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index 877ad2f08330..6db5cba809e3 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -336,15 +336,20 @@ class Graph(object): test_parameters = copy.copy(build_parameters) test_parameters['build_url'] = build_url test_parameters['tests_url'] = tests_url - test_parameters['total_chunks'] = 1 + test_definition = templates.load(test['task'], {})['task'] + chunk_config = test_definition['extra']['chunks'] + + # Allow branch configs to override task level chunking... if 'chunks' in test: - test_parameters['total_chunks'] = test['chunks'] + chunk_config['total'] = test['chunks'] - for chunk in range(1, test_parameters['total_chunks'] + 1): + test_parameters['total_chunks'] = chunk_config['total'] + + for chunk in range(1, chunk_config['total'] + 1): if 'only_chunks' in test and \ chunk not in test['only_chunks']: - continue; + continue test_parameters['chunk'] = chunk test_task = templates.load(test['task'], test_parameters) From be8b9678dc003b02e85b07a9d79bdea73e31c9c0 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 19:54:52 -0700 Subject: [PATCH 18/26] Bug 1143066 - Use faster worker type and increase chunks for emulators r=garndt --HG-- extra : source : cb0aaf3b129fcadf2605e8912d13846fdce3c643 --- .../taskcluster/tasks/branches/mozilla-central/job_flags.yml | 4 +--- testing/taskcluster/tasks/branches/try/job_flags.yml | 5 ++--- testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml | 1 + testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml | 3 ++- testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml | 1 + testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml | 1 + .../tasks/tests/b2g_emulator_marionette_webapi.yml | 1 + testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml | 3 ++- .../taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml | 1 + testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml | 3 ++- testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml | 1 + .../tasks/tests/b2g_emulator_xpcshell_chunked.yml | 3 ++- .../tasks/tests/b2g_gaia_js_integration_tests.yml | 2 +- .../tasks/tests/mulet_gaia_js_integration_tests.yml | 2 +- 14 files changed, 19 insertions(+), 12 deletions(-) diff --git a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml index e027717fa473..4961614218e4 100644 --- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml +++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml @@ -106,12 +106,10 @@ tests: allowed_build_tasks: tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_mochitest.yml - chunks: 9 tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_mochitest.yml tasks/builds/mulet_linux.yml: task: tasks/tests/mulet_mochitests.yml - chunks: 5 mochitest-oop: allowed_build_tasks: tasks/builds/b2g_desktop_opt.yml: @@ -127,6 +125,6 @@ tests: xpcshell: allowed_build_tasks: tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_xpcshell.yml + task: tasks/tests/b2g_emulator_xpcshell_chunked.yml tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_xpcshell_chunked.yml diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index 9f5c3d6e5cc5..8957681edcd2 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -128,7 +128,6 @@ tests: task: tasks/tests/b2g_emulator_mochitest.yml tasks/builds/b2g_emulator_ics_opt.yml: task: tasks/tests/b2g_emulator_mochitest.yml - chunks: 9 tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_mochitest.yml tasks/builds/mulet_linux.yml: @@ -152,8 +151,8 @@ tests: xpcshell: allowed_build_tasks: tasks/builds/b2g_emulator_kk_opt.yml: - task: tasks/tests/b2g_emulator_xpcshell.yml + task: tasks/tests/b2g_emulator_xpcshell_chunked.yml tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_xpcshell.yml + task: tasks/tests/b2g_emulator_xpcshell_chunked.yml tasks/builds/b2g_emulator_ics_debug.yml: task: tasks/tests/b2g_emulator_xpcshell_chunked.yml diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml index 51598a1517c7..47f3c92f8a18 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml @@ -6,6 +6,7 @@ task: name: '[TC] CPP Unit Tests' description: CPP Unit Tests test run + workerType: b2gtest-emulator payload: command: - entrypoint diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml index 7b995c81aff6..9e64fed0cf23 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml @@ -6,6 +6,7 @@ task: name: '[TC] Crashtest' description: Crashtest test run {{chunk}} + workerType: b2gtest-emulator payload: maxRunTime: 3600 command: @@ -29,7 +30,7 @@ task: extra: chunks: - total: 3 + total: 5 treeherder: groupName: Reftest diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml index 4f80a30211ae..144bd5aea85d 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml @@ -6,6 +6,7 @@ task: name: '[TC] JSReftest' description: JSReftest test run {{chunk}} + workerType: b2gtest-emulator payload: command: - entrypoint diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml b/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml index fd1c9e913b23..b0923f3ac292 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml @@ -6,6 +6,7 @@ task: name: '[TC] Marionette Framework Unit Tests' description: Marionette Framework Unit Tests test run + workerType: b2gtest-emulator payload: command: - entrypoint diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml b/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml index a124b1d856e8..8f156fd8af00 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml @@ -6,6 +6,7 @@ task: name: '[TC] Marionette WebAPI Tests' description: Marionette WebAPI test run + workerType: b2gtest-emulator payload: command: - entrypoint diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml index 14dda26fd9f0..1078167894d4 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml @@ -6,6 +6,7 @@ task: name: '[TC] Mochitest' description: Mochitest test run {{chunk}} + workerType: b2gtest-emulator payload: maxRunTime: 7200 command: @@ -30,7 +31,7 @@ task: extra: chunks: - total: 20 + total: 50 treeherder: groupName: Mochitest groupSymbol: tc-M diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml index d72a0c08b08f..36c9564ac5a5 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml @@ -6,6 +6,7 @@ task: name: '[TC] Mochitest' description: Mochitest Media test run + workerType: b2gtest-emulator payload: command: - entrypoint diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml index 6993bd181990..bc099fec5d18 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml @@ -6,6 +6,7 @@ task: name: '[TC] Reftest' description: Reftest test run {{chunk}} + workerType: b2gtest-emulator payload: command: - entrypoint @@ -28,7 +29,7 @@ task: extra: chunks: - total: 20 + total: 40 treeherder: groupName: Reftest groupSymbol: tc-R diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml index c02afe9b0581..cab1745236b5 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml @@ -6,6 +6,7 @@ task: name: '[TC] XPCShell' description: XPCShell test run + workerType: b2gtest-emulator payload: maxRunTime: 6000 command: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml index 43496f3f34c7..157541255a6c 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml @@ -6,6 +6,7 @@ task: name: '[TC] XPCShell' description: XPCShell test run {{chunk}} + workerType: b2gtest-emulator payload: maxRunTime: 6000 command: @@ -29,7 +30,7 @@ task: extra: chunks: - total: 2 + total: 20 treeherder: groupName: XPCShell symbol: X{{chunk}} diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml index 83450341ea55..6edab493547a 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml @@ -30,7 +30,7 @@ task: extra: chunks: - total: 10 + total: 20 treeherder: groupName: Gaia JS Integration Test groupSymbol: tc-Gij diff --git a/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml b/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml index 683e9896955d..db2612e99389 100644 --- a/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml +++ b/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml @@ -31,7 +31,7 @@ task: extra: chunks: - total: 10 + total: 20 treeherder: groupName: Gaia JS Integration Test groupSymbol: tc-Gij From bb5f3a2c6dcefb0d5df3246e440b3b4fa849e860 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 23:10:27 -0700 Subject: [PATCH 19/26] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/d085f03ca923 Author: Staś Małolepszy Desc: Merge pull request #28619 from stasm/1139293-remove-arfrzh-from-meta Bug 1139293 - Remove ar, fr and zh-TW from meta availableLanguages. r=gandalf ======== https://hg.mozilla.org/integration/gaia-central/rev/d545f9d44835 Author: Staś Małolepszy Desc: Bug 1139293 - Remove ar, fr and zh-TW from meta availableLanguages. r=gandalf --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ea1160b05ef4..19c930578878 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3e17ba1ac689c0c1746300f9e13efc9db59c46df", + "git_revision": "3eee5ceea471d3bd3bf09a1a4576be247a83b6ae", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "81e40f8fa2228ad5802768e2942237c992653381", + "revision": "d085f03ca923b7e44747ea3a010dcd8de75de0f8", "repo_path": "integration/gaia-central" } From 2d2b00c0a9cddf00b725f854c30267a3da71f365 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 13 Mar 2015 23:13:27 -0700 Subject: [PATCH 20/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ffff2d570145..f9da8cb15516 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4341d3542d08..aa8856701de3 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 05719f9ceaf3..3627637dffe5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ef9190ce3165..b927238e1c00 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 6079ca71a450..e24e364b6b5d 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 4341d3542d08..aa8856701de3 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 9bf5f0f47e92..bd155cbc89c9 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 893b65bdb6be..3f9c668472f6 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 56336c9db5c9..1ae0e808d7a1 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 650971c37160..b6d43c7df278 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 93a73fdd01f1cd0a2164b2e57c368c344ce71547 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 14 Mar 2015 13:12:43 -0700 Subject: [PATCH 21/26] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/dbbbfe842943 Author: Staś Małolepszy Desc: Merge pull request #28876 from stasm/1143140-pseudol10n-exclude-html-entities Bug 1143140 - Don't pseudolocalize HTML entities. r=gandalf ======== https://hg.mozilla.org/integration/gaia-central/rev/14c11852da2b Author: Staś Małolepszy Desc: Bug 1143140 - Don't pseudolocalize HTML entities. r=gandalf --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 19c930578878..5e444421139f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3eee5ceea471d3bd3bf09a1a4576be247a83b6ae", + "git_revision": "4868c56c0a3b7a1e51d55b24457e44a7709ea1ae", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "d085f03ca923b7e44747ea3a010dcd8de75de0f8", + "revision": "dbbbfe84294377ef3a7efaebcf57696a30b58cdb", "repo_path": "integration/gaia-central" } From 19e6274217e732c0a5252002442622eb9eb704b9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 14 Mar 2015 13:15:18 -0700 Subject: [PATCH 22/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 4 ++-- b2g/config/emulator-ics/sources.xml | 4 ++-- b2g/config/emulator-jb/sources.xml | 4 ++-- b2g/config/emulator-kk/sources.xml | 4 ++-- b2g/config/emulator-l/sources.xml | 4 ++-- b2g/config/emulator/sources.xml | 4 ++-- b2g/config/flame-kk/sources.xml | 4 ++-- b2g/config/flame/sources.xml | 4 ++-- b2g/config/nexus-4/sources.xml | 4 ++-- b2g/config/nexus-5-l/sources.xml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f9da8cb15516..c1024ca67869 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index aa8856701de3..224980eed50b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,13 +19,13 @@ - + - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3627637dffe5..d20dfd07338a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,10 +17,10 @@ - + - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b927238e1c00..5a9a54057744 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index e24e364b6b5d..d7e52d7e84cb 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index aa8856701de3..224980eed50b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,13 +19,13 @@ - + - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index bd155cbc89c9..71df4c80be97 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3f9c668472f6..9e7c6c66044f 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,10 +17,10 @@ - + - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 1ae0e808d7a1..19ad1e9ce055 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,10 +17,10 @@ - + - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index b6d43c7df278..3e7f6d4772d2 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + From 25776a09cd7d1a71e3e09bb04bee8ba469055d53 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Fri, 13 Mar 2015 14:41:35 -0700 Subject: [PATCH 23/26] Bug 1143055 - Enable emulator-l builds r=wcosta --HG-- extra : rebase_source : 02b2b2a434d3343354788ad6630e3b80b275f31a --- .../tasks/branches/base_job_flags.yml | 1 + .../tasks/branches/try/job_flags.yml | 8 +++++++ .../tasks/builds/b2g_emulator_l_debug.yml | 23 +++++++++++++++++++ .../tasks/builds/b2g_emulator_l_opt.yml | 21 +++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml create mode 100644 testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml index d67875c34a3e..c1ef9a673191 100644 --- a/testing/taskcluster/tasks/branches/base_job_flags.yml +++ b/testing/taskcluster/tasks/branches/base_job_flags.yml @@ -6,6 +6,7 @@ flags: - emulator - emulator-jb - emulator-kk + - emulator-l - linux32_gecko # b2g desktop linux 32 bit - linux64_gecko # b2g desktop linux 64 bit - linux64-mulet # Firefox desktop - b2g gecko linux 64 bit diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index 8957681edcd2..ce6922a4131b 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -20,6 +20,14 @@ builds: types: opt: task: tasks/builds/mulet_linux.yml + emulator-l: + platfoms: + - b2g + types: + opt: + task: tasks/builds/b2g_emulator_l_opt.yml + debug: + task: tasks/builds/b2g_emulator_l_debug.yml emulator-kk: platfoms: - b2g diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml new file mode 100644 index 000000000000..ba6e39b03204 --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml @@ -0,0 +1,23 @@ +$inherits: + from: 'tasks/builds/b2g_emulator_base.yml' +task: + workerType: emulator-l-debug + scopes: + - 'docker-worker:cache:workspace-emulator-l-debug' + metadata: + name: '[TC] B2G Emulator L Debug' + + extra: + treeherder: + collection: + debug: true + machine: + platform: b2g-emu-l + + payload: + cache: + workspace-emulator-l-debug: /home/worker/workspace + env: + TARGET: 'emulator-l' + B2G_DEBUG: 1 + diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml new file mode 100644 index 000000000000..da5958d10335 --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml @@ -0,0 +1,21 @@ +$inherits: + from: 'tasks/builds/b2g_emulator_base.yml' +task: + workerType: emulator-l + scopes: + - 'docker-worker:cache:workspace-emulator-l-opt' + metadata: + name: '[TC] B2G L Emulator Opt' + + extra: + treeherder: + machine: + platform: b2g-emu-l + + payload: + cache: + workspace-emulator-l-opt: /home/worker/workspace + env: + TARGET: 'emulator-l' + + From 7f17c8425d8c5aa55de09751a89100bbac86b6ab Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 15 Mar 2015 01:09:27 -0700 Subject: [PATCH 24/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index c1024ca67869..67048f5397c2 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 224980eed50b..60614af09a55 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d20dfd07338a..9bddf5263471 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5a9a54057744..9b50902f9203 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index d7e52d7e84cb..a4845547760d 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 224980eed50b..60614af09a55 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 71df4c80be97..4d7ba874c8de 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 9e7c6c66044f..f6bc9d2bfac5 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 19ad1e9ce055..7c4d8bb0dbf7 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 3e7f6d4772d2..dd96960a892b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -23,7 +23,7 @@ - + From 0563fef074caaed08f49045359b006edec531adf Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 15 Mar 2015 05:04:47 -0700 Subject: [PATCH 25/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 67048f5397c2..7b2c9ecbaa01 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 60614af09a55..02e342f3b586 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 9bddf5263471..83d8966560ea 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 9b50902f9203..06730266a767 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index a4845547760d..c520244246a3 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 60614af09a55..02e342f3b586 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 4d7ba874c8de..7567df5d7402 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f6bc9d2bfac5..55c2091bead7 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 7c4d8bb0dbf7..c23a8223f72f 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index dd96960a892b..13fe2c8789a4 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -23,7 +23,7 @@ - + From fd2a57ed564a4a26eeca032ff53542105bfe8fd2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 15 Mar 2015 13:45:41 -0700 Subject: [PATCH 26/26] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7b2c9ecbaa01..a547d5aad0f7 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 02e342f3b586..1eee59d785a4 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 83d8966560ea..e52bde6a0d8e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 06730266a767..d516154a4dee 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index c520244246a3..27241f5a03f3 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 02e342f3b586..1eee59d785a4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 7567df5d7402..a30e5f6372a3 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 55c2091bead7..23befab2aa3e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index c23a8223f72f..942f458f6d49 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 13fe2c8789a4..ee51c5192417 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -23,7 +23,7 @@ - +