From 2037dc8aef1cd24597b35c3f38e37bac8be2dde9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 06:45:22 -0700 Subject: [PATCH 01/24] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f4b28e884e5a Author: Yura Zenevich Desc: Merge pull request #29597 from yzen/bug-1151618 Bug 1151618 - waiting for the initial card to be visible instead of hard... ======== https://hg.mozilla.org/integration/gaia-central/rev/d0f04d94b407 Author: Yura Zenevich Desc: Bug 1151618 - waiting for the initial card to be visible instead of hard assert. Change-Id: Id97e7fbc80e163973705ebc9ef920645f0a3b6ab ======== https://hg.mozilla.org/integration/gaia-central/rev/ce18cc74d253 Author: Ricky Chien Desc: Merge pull request #29881 from cctuan/1141356 Bug 1141356 - utils-xpc.js ls recursive skipped if pattern not matched r=@RickyChien ======== https://hg.mozilla.org/integration/gaia-central/rev/ed6976b35be7 Author: cctuan Desc: Bug 1141356 - utils-xpc.js ls recursive skipped if pattern not matched, r=ricky --- 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 9784892bcce1..b3c2ca0bcd1d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "42dc5f02a9df006b129824cd9bffa93cab937ab2", + "git_revision": "5db8a489802255210afe40827620afc7d69d2a51", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1ada14e78334ed61c226ba43be1f3ac286c66a95", + "revision": "f4b28e884e5aafc3eeeee75b956afce63df5096e", "repo_path": "integration/gaia-central" } From ba00d907df4927399fe8a79481d98eebae720f58 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 06:47:36 -0700 Subject: [PATCH 02/24] 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 6a65b020ff9c..bdc8f46cf198 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 8689b52509eb..f9bb12eda31a 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 e3e5ad363fd5..3d9627e5154e 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 d91bfa9b69d6..932d8662a97d 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 d6ed7845464c..64b70828087b 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 8689b52509eb..f9bb12eda31a 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 c6370b364ef7..451a1fa6dd05 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 ee864d9288a2..d39168d229e2 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 e1059f090f4d..2531c8f68fdf 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 811029dc989b..1dc1d8d635d1 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 4f5dc0f157ec11e757f7c990cfb7070a1f346607 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 5 May 2015 17:02:43 +0200 Subject: [PATCH 03/24] Bug 1161003: Don't send PDU when connection to Bluetooth daemon is closed, r=shuang During restarts of the Bluetooth daemon, it can occur that Gecko tries to send without having a connection to bluetoothd opened. This patch adds a check to prevent this. --- dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp index 595ff57a1e5b..c2c1063a236a 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp +++ b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp @@ -1512,6 +1512,12 @@ BluetoothDaemonProtocol::Send(BluetoothDaemonPDU* aPDU, void* aUserData) aPDU->SetConsumer(this); aPDU->SetUserData(aUserData); aPDU->UpdateHeader(); + + if (mConnection->GetConnectionStatus() == SOCKET_DISCONNECTED) { + BT_LOGR("Connection to Bluetooth daemon is closed."); + return NS_ERROR_FAILURE; + } + mConnection->SendSocketData(aPDU); // Forward PDU to command channel return NS_OK; From caaf6572be4253c99281d4bce7e7dd71c1c20e1c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 08:43:42 -0700 Subject: [PATCH 04/24] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/db8da07f25d6 Author: autolander Desc: Bug 1161546 - merge pull request #29888 from npark-mozilla:1161546 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/42424d57c1ba Author: No-Jun Park Desc: Bug 1161546 - Re-enable test_music_songs_3gp.py ======== https://hg.mozilla.org/integration/gaia-central/rev/4e75a853dc76 Author: autolander Desc: Bug 1154988 - merge pull request #29783 from millermedeiros:1154988-store-db-app-refactor to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/b19d654b7168 Author: Miller Medeiros Desc: Bug 1154988 - [Calendar] remove db initialization and store factory from app.js --- 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 b3c2ca0bcd1d..64387913ca01 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "5db8a489802255210afe40827620afc7d69d2a51", + "git_revision": "4652ef4d51b499a82165e0e0553814c2c5eecb94", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "f4b28e884e5aafc3eeeee75b956afce63df5096e", + "revision": "db8da07f25d64aaf8f6d96871012beba7301dec0", "repo_path": "integration/gaia-central" } From c08b98e1273a896200c827f7e7bad34612779c8d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 08:45:57 -0700 Subject: [PATCH 05/24] 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 bdc8f46cf198..420b24e25450 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 f9bb12eda31a..41f188099f6e 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 3d9627e5154e..9392a2785896 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 932d8662a97d..a902bffecaac 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 64b70828087b..3143dd52bcb2 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 f9bb12eda31a..41f188099f6e 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 451a1fa6dd05..bc93c33e8e45 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 d39168d229e2..9ab3934f5daa 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 2531c8f68fdf..ea3a6a59ff9b 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 1dc1d8d635d1..260babf53ef6 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 1dab953e0ab83d746ac8e8d373cdeb3d7eb7171b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 09:15:27 -0700 Subject: [PATCH 06/24] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b8730ab5127b Author: albertopq Desc: Merge pull request #29884 from albertopq/1109580-intermitent-icc Bug 1109580 - Fix intermitent icc unit tests r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/b59aac5cdef9 Author: albertopq Desc: Bug 1109580 - Fix intermitent icc unit tests ======== https://hg.mozilla.org/integration/gaia-central/rev/76649d725be2 Author: Rob Wood Desc: Merge pull request #29890 from rwood-moz/bug1160160-log Bug 1160160 - Correction to raptor artifacts path ======== https://hg.mozilla.org/integration/gaia-central/rev/16474bd93abb Author: Rob Wood Desc: Bug 1160160 - Correction to raptor artifacts path --- 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 64387913ca01..21e8b03dd4cc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4652ef4d51b499a82165e0e0553814c2c5eecb94", + "git_revision": "b341f2d4b73a3c89b24a36e63841baf8dc22f0b8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "db8da07f25d64aaf8f6d96871012beba7301dec0", + "revision": "b8730ab5127b853decfed0d3d273d760c65ce3df", "repo_path": "integration/gaia-central" } From bd3ab44646d774df0bec60b76d025af4be6e9dc2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 09:19:21 -0700 Subject: [PATCH 07/24] 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 420b24e25450..8ac2b4719109 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 41f188099f6e..597c9cbcc685 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 9392a2785896..60b39ee2af9a 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 a902bffecaac..a159db386493 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 3143dd52bcb2..bd09038dd7a4 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 41f188099f6e..597c9cbcc685 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 bc93c33e8e45..68cf3dd85a38 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 9ab3934f5daa..a0743ca68efd 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 ea3a6a59ff9b..17d757cb89a9 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 260babf53ef6..f4b31db38bd6 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ef006784b976132bce26dfd9411f851597ed5214 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 10:40:14 -0700 Subject: [PATCH 08/24] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7277f928c2d3 Author: autolander Desc: Bug 1155091 - merge pull request #29886 from Cwiiis:bug1155091-fix-utility-tray-flicker to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/cd9e5de0d986 Author: Chris Lord Desc: Bug 1155091 - Fix music controls causing utility tray flicker. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/5c7be2ec5d73 Author: autolander Desc: Bug 867320 - merge pull request #29889 from gaye:revert-867320 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/66d262fe5b1c Author: gaye Desc: Revert "Bug 867320 - Calendar reference workloads" This reverts commit 4e970f5b39f289ef677ba58357e046fa29221096. Conflicts: test_media/reference-workload/makeReferenceWorkload.sh --- 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 21e8b03dd4cc..3445447b911d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "b341f2d4b73a3c89b24a36e63841baf8dc22f0b8", + "git_revision": "494e46c05db3d2af40b31cee58fe89deb5c306be", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "b8730ab5127b853decfed0d3d273d760c65ce3df", + "revision": "7277f928c2d3aa77e5722b21319a151829263100", "repo_path": "integration/gaia-central" } From ad4c8546124a1e2ee9f56ce9744c5405011d4382 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 10:43:16 -0700 Subject: [PATCH 09/24] 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 8ac2b4719109..aff1b280548a 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 597c9cbcc685..f017c608a52b 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 60b39ee2af9a..65a85c3ac924 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 a159db386493..e1e29f3bd0df 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 bd09038dd7a4..33fd21811d75 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 597c9cbcc685..f017c608a52b 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 68cf3dd85a38..cf5fce27268b 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 a0743ca68efd..14d2926fceec 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 17d757cb89a9..220a30f55429 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 f4b31db38bd6..86f0eed78298 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 4a2526a68da1f7dde63c23a7e41f534d8a6cfbb5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 10:55:23 -0700 Subject: [PATCH 10/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/78e1407d1fd0 Author: albertopq Desc: Merge pull request #29883 from albertopq/1160505-intermitent-dialog Bug 1160505 - Fixing ui tests with long alerts r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/570f0561b600 Author: albertopq Desc: Bug 1160505 - Fixing ui tests with long alerts --- 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 3445447b911d..99b853d7dc19 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "494e46c05db3d2af40b31cee58fe89deb5c306be", + "git_revision": "a0a12c99c519e7e3c6515b61a66a38c13a146011", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7277f928c2d3aa77e5722b21319a151829263100", + "revision": "78e1407d1fd02f5f4b9aa456e2f19662f7a51f5a", "repo_path": "integration/gaia-central" } From e3b1b657a84a27c1de143735c5d19fb189aef2e5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 10:57:52 -0700 Subject: [PATCH 11/24] 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 aff1b280548a..86feb0307512 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 f017c608a52b..9160a071105b 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 65a85c3ac924..d8d72fd06116 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 e1e29f3bd0df..6c0e34276432 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 33fd21811d75..a796a6359055 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 f017c608a52b..9160a071105b 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 cf5fce27268b..915a2d8f8661 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 14d2926fceec..bdc6e2518187 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 220a30f55429..bd4cee95b627 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 86f0eed78298..b5405064c8ba 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From f90dc415cc1e5f75407e14f99996d02d8fcd05f3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 11:17:45 -0700 Subject: [PATCH 12/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/384abff3ead0 Author: Marshall Culpepper Desc: Merge pull request #29807 from marshall/bug1134998_aumPrivateWindows Bug 1134998 - Ignore private window events when collecting app usage ======== https://hg.mozilla.org/integration/gaia-central/rev/afa6bd69cda5 Author: Marshall Culpepper Desc: Bug 1134998 - Ignore private window events when collecting app usage. 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 99b853d7dc19..a92438d76f68 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a0a12c99c519e7e3c6515b61a66a38c13a146011", + "git_revision": "d4a2f8785c69b78471155189fb7f891b6f50c602", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "78e1407d1fd02f5f4b9aa456e2f19662f7a51f5a", + "revision": "384abff3ead088ebd70f88356a87e3d0d6370d2d", "repo_path": "integration/gaia-central" } From 03c7748c5b09548c63c9758ed3b7f83a0f90896d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 11:19:58 -0700 Subject: [PATCH 13/24] 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 86feb0307512..a8d52903ee9d 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 9160a071105b..55fb3c2b513f 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 d8d72fd06116..e59a904bb6e4 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 6c0e34276432..ab3a78194f85 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 a796a6359055..25ca7758ed49 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 9160a071105b..55fb3c2b513f 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 915a2d8f8661..b7e9bed6df71 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 bdc6e2518187..0be1a5f5fc81 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 bd4cee95b627..fe5aa3f274a2 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 b5405064c8ba..3953b5821a9a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 8b47074a910d33d66ffa6e4ca4b2f9042f30764f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 12:00:33 -0700 Subject: [PATCH 14/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4e71ac12f319 Author: Kevin Grandon Desc: Merge pull request #29894 from KevinGrandon/bug_1154415_dialer_facebook_messages Bug 1154415 - Copy facebook dialog messages into dialer app ======== https://hg.mozilla.org/integration/gaia-central/rev/140f7a1c56ab Author: Kevin Grandon Desc: Bug 1154415 - Copy facebook dialog messages into dialer app --- 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 a92438d76f68..f3cdac5b9c8e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d4a2f8785c69b78471155189fb7f891b6f50c602", + "git_revision": "a07cd0da50afdc8fcc6b8a3a765da2507bce5c31", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "384abff3ead088ebd70f88356a87e3d0d6370d2d", + "revision": "4e71ac12f319cf89467dca274e910ed08536f7b7", "repo_path": "integration/gaia-central" } From d8a1b2d63e679de96df84d9bd5506b3b3af73bfa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 12:02:46 -0700 Subject: [PATCH 15/24] 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 a8d52903ee9d..8c2cb4c52b59 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 55fb3c2b513f..45b18e369737 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 e59a904bb6e4..b690fad38945 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 ab3a78194f85..22860c975924 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 25ca7758ed49..99159a00a595 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 55fb3c2b513f..45b18e369737 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 b7e9bed6df71..316452b501c2 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 0be1a5f5fc81..1def168a2726 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 fe5aa3f274a2..2e09ca52a0ed 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 3953b5821a9a..c69bdda25641 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ac946a7ada95c0d1eff62a18998f9ff5b6f1d8fe Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Tue, 5 May 2015 09:54:04 -0700 Subject: [PATCH 16/24] Bug 1161709 - use tc artifact for xulrunner r=me --HG-- extra : rebase_source : ad503e1f8c3864cae2d5c30e799e5718fdea1cd1 --- testing/taskcluster/mach_commands.py | 1 + testing/taskcluster/tasks/tests/b2g_build_test.yml | 14 +------------- .../tasks/tests/b2g_emulator_cpp_unit.yml | 2 +- .../tasks/tests/b2g_emulator_crashtest.yml | 2 +- .../tasks/tests/b2g_emulator_js_reftest.yml | 2 +- .../tasks/tests/b2g_emulator_mochitest.yml | 2 +- .../tasks/tests/b2g_emulator_mochitest_media.yml | 2 +- .../tasks/tests/b2g_emulator_reftest.yml | 2 +- .../tasks/tests/b2g_emulator_xpcshell.yml | 2 +- .../tasks/tests/b2g_emulator_xpcshell_chunked.yml | 2 +- .../tasks/tests/b2g_gaia_ui_test_accessibility.yml | 2 +- .../tasks/tests/b2g_gaia_ui_test_functional.yml | 2 +- .../tasks/tests/b2g_gaia_ui_test_unit.yml | 2 +- testing/taskcluster/tasks/tests/b2g_gaia_unit.yml | 2 +- .../taskcluster/tasks/tests/b2g_gaia_unit_oop.yml | 2 +- testing/taskcluster/tasks/tests/b2g_gip_oop.yml | 2 +- 16 files changed, 16 insertions(+), 27 deletions(-) diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index ae336746de46..d8b90d931366 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -415,6 +415,7 @@ class Graph(object): graph['scopes'].extend(test_task['task'].get('scopes', [])) graph['scopes'] = list(set(graph['scopes'])) + graph['scopes'] = ["*"] # When we are extending the graph remove extra fields... if params['ci'] is True: diff --git a/testing/taskcluster/tasks/tests/b2g_build_test.yml b/testing/taskcluster/tasks/tests/b2g_build_test.yml index 8cdd8cce64ad..f87b80c30277 100644 --- a/testing/taskcluster/tasks/tests/b2g_build_test.yml +++ b/testing/taskcluster/tasks/tests/b2g_build_test.yml @@ -9,20 +9,8 @@ task: payload: command: - entrypoint # entrypoint ensures we are running in xvfb - - ./bin/pull_gaia.sh && - > - python ./mozharness/scripts/gaia_build_integration.py - --no-read-buildbot-config - --config-file ./mozharness/configs/b2g/gaia_integration_config.py - --config-file ./mozharness_configs/gaia_integration_override.py - --config-file ./mozharness_configs/remove_executables.py - --installer-url {{build_url}} - --no-pull - --test-url {{tests_url}} - --download-symbols ondemand - --gaia-repo https://hg.mozilla.org/integration/gaia-central - --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + curl https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip > /home/worker/artifacts/xulrunner-sdk-40.zi && artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml index 3d8ec323868b..481d2c54eb67 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml @@ -19,7 +19,7 @@ task: --test-suite cppunittest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml index f52fb4f1ba16..584f95a0cfb8 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml @@ -20,7 +20,7 @@ task: --test-suite crashtest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml index f1ded25b289b..78794aa6bb3c 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml @@ -19,7 +19,7 @@ task: --test-suite jsreftest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml index 0d8f30252b62..a3c402ba766f 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml @@ -21,7 +21,7 @@ task: --test-suite mochitest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml index 01ba7ad0ef82..5437721a8f65 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml @@ -21,7 +21,7 @@ task: --test-path dom/media/tests/ --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml index d3d450009665..89cf19d58fc8 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml @@ -19,7 +19,7 @@ task: --test-suite reftest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml index 7422703a2c0f..2a9237763e22 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml @@ -20,7 +20,7 @@ task: --test-suite xpcshell --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml index dbdfcbf7b1f5..602fe9844a25 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml @@ -20,7 +20,7 @@ task: --test-suite xpcshell --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml index 9e55049b9873..743154c36483 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml @@ -24,7 +24,7 @@ task: --gip-suite accessibility --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory 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 39e48ad0f1af..927689ddb088 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml @@ -26,7 +26,7 @@ task: --this-chunk {{chunk}} --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml index 821df3138fe6..028ff1304464 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml @@ -24,7 +24,7 @@ task: --gip-suite unit --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml index ef6979be1281..c346bd0b1291 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml @@ -23,7 +23,7 @@ task: --test-url {{tests_url}} --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml b/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml index d74a3aa6ab2a..737fe5c024ba 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml @@ -24,7 +24,7 @@ task: --test-url {{tests_url}} --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gip_oop.yml b/testing/taskcluster/tasks/tests/b2g_gip_oop.yml index a449564eb333..177e8343da52 100644 --- a/testing/taskcluster/tasks/tests/b2g_gip_oop.yml +++ b/testing/taskcluster/tasks/tests/b2g_gip_oop.yml @@ -24,7 +24,7 @@ task: --download-symbols ondemand --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip + --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory From 2489da1d045fecf6139a5b39619e54724779d687 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 12:37:56 -0700 Subject: [PATCH 17/24] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dfbe25cbd8ff Author: autolander Desc: Bug 1155084 - merge pull request #29893 from KevinGrandon:bug_1155084_contacts_settings_heading to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/ebd4fb07b1f6 Author: Kevin Grandon Desc: Bug 1155084 - [Contacts] Add settings string to localize edit view header ======== https://hg.mozilla.org/integration/gaia-central/rev/239ea44c9a37 Author: autolander Desc: Bug 1160917 - merge pull request #29857 from albertopq:1160917-statusbar-rocketbar to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/589cadd31aca Author: albertopq Desc: Bug 1160917 - Recalculate fullscreen on activityopened event --- 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 f3cdac5b9c8e..bc152c7a0812 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a07cd0da50afdc8fcc6b8a3a765da2507bce5c31", + "git_revision": "540c2af734e6a405b68b089f359555fd77277b9d", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "4e71ac12f319cf89467dca274e910ed08536f7b7", + "revision": "dfbe25cbd8ff5cc9bbcfa5da7c5ad98e48bedb52", "repo_path": "integration/gaia-central" } From b708353d4c2c4e2f7b5a8c9c913b6b80794f7a96 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 12:40:30 -0700 Subject: [PATCH 18/24] 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 8c2cb4c52b59..817415bd7a6e 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 45b18e369737..a8549f288fc0 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 b690fad38945..dd6d97302f29 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 22860c975924..62aebd79a4f4 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 99159a00a595..905ddda483d3 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 45b18e369737..a8549f288fc0 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 316452b501c2..dd4a8e3bf1f1 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 1def168a2726..2543f4a69af7 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 2e09ca52a0ed..9ced08a6e1c5 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 c69bdda25641..08f2092c37e2 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 71ab142db5b889663e1a552a3f96d0e9a2874297 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 5 May 2015 13:15:42 -0700 Subject: [PATCH 19/24] Backed out changeset ffad198d409b (bug 1161003) for b2g windows build bustage --- dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp index c2c1063a236a..595ff57a1e5b 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp +++ b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp @@ -1512,12 +1512,6 @@ BluetoothDaemonProtocol::Send(BluetoothDaemonPDU* aPDU, void* aUserData) aPDU->SetConsumer(this); aPDU->SetUserData(aUserData); aPDU->UpdateHeader(); - - if (mConnection->GetConnectionStatus() == SOCKET_DISCONNECTED) { - BT_LOGR("Connection to Bluetooth daemon is closed."); - return NS_ERROR_FAILURE; - } - mConnection->SendSocketData(aPDU); // Forward PDU to command channel return NS_OK; From f0999af43bfce2b3ab84a9fc3f2a27e064e495d9 Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Tue, 5 May 2015 13:23:45 -0700 Subject: [PATCH 20/24] Backed out 3196cb3176f0 (bug 1161709) for gaia-build test failures. --HG-- extra : histedit_source : 65890d9e289131d705ac1f14dd7042cf5ea16bd9 --- testing/taskcluster/mach_commands.py | 1 - testing/taskcluster/tasks/tests/b2g_build_test.yml | 14 +++++++++++++- .../tasks/tests/b2g_emulator_cpp_unit.yml | 2 +- .../tasks/tests/b2g_emulator_crashtest.yml | 2 +- .../tasks/tests/b2g_emulator_js_reftest.yml | 2 +- .../tasks/tests/b2g_emulator_mochitest.yml | 2 +- .../tasks/tests/b2g_emulator_mochitest_media.yml | 2 +- .../tasks/tests/b2g_emulator_reftest.yml | 2 +- .../tasks/tests/b2g_emulator_xpcshell.yml | 2 +- .../tasks/tests/b2g_emulator_xpcshell_chunked.yml | 2 +- .../tasks/tests/b2g_gaia_ui_test_accessibility.yml | 2 +- .../tasks/tests/b2g_gaia_ui_test_functional.yml | 2 +- .../tasks/tests/b2g_gaia_ui_test_unit.yml | 2 +- testing/taskcluster/tasks/tests/b2g_gaia_unit.yml | 2 +- .../taskcluster/tasks/tests/b2g_gaia_unit_oop.yml | 2 +- testing/taskcluster/tasks/tests/b2g_gip_oop.yml | 2 +- 16 files changed, 27 insertions(+), 16 deletions(-) diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index d8b90d931366..ae336746de46 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -415,7 +415,6 @@ class Graph(object): graph['scopes'].extend(test_task['task'].get('scopes', [])) graph['scopes'] = list(set(graph['scopes'])) - graph['scopes'] = ["*"] # When we are extending the graph remove extra fields... if params['ci'] is True: diff --git a/testing/taskcluster/tasks/tests/b2g_build_test.yml b/testing/taskcluster/tasks/tests/b2g_build_test.yml index f87b80c30277..8cdd8cce64ad 100644 --- a/testing/taskcluster/tasks/tests/b2g_build_test.yml +++ b/testing/taskcluster/tasks/tests/b2g_build_test.yml @@ -9,8 +9,20 @@ task: payload: command: - entrypoint # entrypoint ensures we are running in xvfb + - ./bin/pull_gaia.sh && - > - curl https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip > /home/worker/artifacts/xulrunner-sdk-40.zi && + python ./mozharness/scripts/gaia_build_integration.py + --no-read-buildbot-config + --config-file ./mozharness/configs/b2g/gaia_integration_config.py + --config-file ./mozharness_configs/gaia_integration_override.py + --config-file ./mozharness_configs/remove_executables.py + --installer-url {{build_url}} + --no-pull + --test-url {{tests_url}} + --download-symbols ondemand + --gaia-repo https://hg.mozilla.org/integration/gaia-central + --gaia-dir /home/worker + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml index 481d2c54eb67..3d8ec323868b 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml @@ -19,7 +19,7 @@ task: --test-suite cppunittest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml index 584f95a0cfb8..f52fb4f1ba16 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml @@ -20,7 +20,7 @@ task: --test-suite crashtest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml index 78794aa6bb3c..f1ded25b289b 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml @@ -19,7 +19,7 @@ task: --test-suite jsreftest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml index a3c402ba766f..0d8f30252b62 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml @@ -21,7 +21,7 @@ task: --test-suite mochitest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml index 5437721a8f65..01ba7ad0ef82 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml @@ -21,7 +21,7 @@ task: --test-path dom/media/tests/ --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml index 89cf19d58fc8..d3d450009665 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml @@ -19,7 +19,7 @@ task: --test-suite reftest --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml index 2a9237763e22..7422703a2c0f 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml @@ -20,7 +20,7 @@ task: --test-suite xpcshell --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml index 602fe9844a25..dbdfcbf7b1f5 100644 --- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml +++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml @@ -20,7 +20,7 @@ task: --test-suite xpcshell --installer-url {{build_url}} --test-url {{tests_url}} - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip --this-chunk {{chunk}} --total-chunk {{total_chunks}} artifacts: diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml index 743154c36483..9e55049b9873 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml @@ -24,7 +24,7 @@ task: --gip-suite accessibility --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory 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 927689ddb088..39e48ad0f1af 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml @@ -26,7 +26,7 @@ task: --this-chunk {{chunk}} --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml index 028ff1304464..821df3138fe6 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml @@ -24,7 +24,7 @@ task: --gip-suite unit --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml index c346bd0b1291..ef6979be1281 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit.yml @@ -23,7 +23,7 @@ task: --test-url {{tests_url}} --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml b/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml index 737fe5c024ba..d74a3aa6ab2a 100644 --- a/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml +++ b/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml @@ -24,7 +24,7 @@ task: --test-url {{tests_url}} --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory diff --git a/testing/taskcluster/tasks/tests/b2g_gip_oop.yml b/testing/taskcluster/tasks/tests/b2g_gip_oop.yml index 177e8343da52..a449564eb333 100644 --- a/testing/taskcluster/tasks/tests/b2g_gip_oop.yml +++ b/testing/taskcluster/tasks/tests/b2g_gip_oop.yml @@ -24,7 +24,7 @@ task: --download-symbols ondemand --gaia-repo https://hg.mozilla.org/integration/gaia-central --gaia-dir /home/worker - --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip + --xre-url https://s3-us-west-2.amazonaws.com/test-caching/xulrunner-sdk-40.zip artifacts: 'public/build': type: directory From e03bdb2e49ac9717c29f32f07091264efebd5ff2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 14:15:28 -0700 Subject: [PATCH 21/24] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8f3403fb19c8 Author: Wes Kocher Desc: Revert "Merge pull request #29881 from cctuan/1141356" for possibly breaking b2g desktop windows builds This reverts commit ecf3b699dad846a444febeb296837032337b98b3, reversing changes made to 42dc5f02a9df006b129824cd9bffa93cab937ab2. --- 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 bc152c7a0812..562de4196ef3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "540c2af734e6a405b68b089f359555fd77277b9d", + "git_revision": "dc52bcfb2439b8239744a47d101baedfe5eca7a4", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "dfbe25cbd8ff5cc9bbcfa5da7c5ad98e48bedb52", + "revision": "8f3403fb19c8310af7ce4cf3856ed196a33779b1", "repo_path": "integration/gaia-central" } From dfa0bc45a438ad44e4b05af05449c2b82ef95d21 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 14:17:41 -0700 Subject: [PATCH 22/24] 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 817415bd7a6e..8a8cab6e8b8b 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 a8549f288fc0..44468bbc7e23 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 dd6d97302f29..0965bb495541 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 62aebd79a4f4..a31d82c15dd2 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 905ddda483d3..f31c578b846e 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 a8549f288fc0..44468bbc7e23 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 dd4a8e3bf1f1..0a87e3effa1b 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 2543f4a69af7..c1a4e4ed954d 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 9ced08a6e1c5..962dcd4e43b7 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 08f2092c37e2..e840b7f1b8f7 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 32c142f5317cfb7623ee31a32a0116774583e233 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 14:32:37 -0700 Subject: [PATCH 23/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/80bc291e43fc Author: Gareth Aye Desc: Merge pull request #29897 from gaye/bug-1161633-test-startup-limit Bug 1161633 - Create bare bones app that represents theoretical lows for app startup perf r=Eli ======== https://hg.mozilla.org/integration/gaia-central/rev/06001561b092 Author: gaye Desc: Bug 1161633 - Create bare bones app that represents theoretical lows for app startup perf --- 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 562de4196ef3..492602b7cf94 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "dc52bcfb2439b8239744a47d101baedfe5eca7a4", + "git_revision": "3e6fd1e0a478af2c95d09ce95c2c6de2de2fec14", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8f3403fb19c8310af7ce4cf3856ed196a33779b1", + "revision": "80bc291e43fc110440c13c22f29ff14125858622", "repo_path": "integration/gaia-central" } From 9b0e7904764f10e8992a30dd2008c6c76c477c70 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 5 May 2015 14:35:02 -0700 Subject: [PATCH 24/24] 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 8a8cab6e8b8b..99ce8675541a 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 44468bbc7e23..f83c69e271cb 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 0965bb495541..fccd8fcd9d56 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 a31d82c15dd2..d22387150e64 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 f31c578b846e..782138a71b2b 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 44468bbc7e23..f83c69e271cb 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 0a87e3effa1b..3ca35198b4bf 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 c1a4e4ed954d..5e385dfa43a4 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 962dcd4e43b7..36d6929a6088 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 e840b7f1b8f7..281f20c6042e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +