diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 473fdacc8b04..83c6bda0694b 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index c863a1b09c75..cb25a8ccaccd 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ed602f0db043..560bfe227dc0 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,12 +19,12 @@
-
+
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 1b152796fe2a..e15ba2009eea 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 73e4e6397170..34f8aae505fc 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 212c2cc69d3f..5d945cf41548 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ed602f0db043..560bfe227dc0 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,12 +19,12 @@
-
+
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 378234ef40bc..6da4a2f2c906 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e798110d82fa..4b49fd142343 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "c1ae9f02f2a9cfb89bf67aeea97e467c41c3362c",
+ "git_revision": "14f32ddf49e9c1f2b30c391a26ba2dc867e948c1",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "1bd25a1c1736a412cf7a982c0d2010d0cad28fec",
+ "revision": "0164a51c5b868d7362a7d048785e43a01bacdea8",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f545b4927019..894c8370f82e 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 2651003ecbe3..498aa0d54177 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/testing/docker/desktop-build/bin/checkout-script.sh b/testing/docker/desktop-build/bin/checkout-script.sh
new file mode 100644
index 000000000000..4de6fa81b6b8
--- /dev/null
+++ b/testing/docker/desktop-build/bin/checkout-script.sh
@@ -0,0 +1,16 @@
+#! /bin/bash -vex
+
+set -x -e
+
+# Inputs, with defaults
+
+: GECKO_HEAD_REPOSITORY ${GECKO_HEAD_REPOSITORY:=https://hg.mozilla.org/mozilla-central}
+: GECKO_HEAD_REV ${GECKO_HEAD_REV:=default}
+
+: SCRIPT_DOWNLOAD_PATH ${SCRIPT_DOWNLOAD_PATH:=$PWD}
+: SCRIPT_PATH ${SCRIPT_PATH:?"script path must be set"}
+set -v
+
+# download script from the gecko repository
+url=${GECKO_HEAD_REPOSITORY}/raw-file/${GECKO_HEAD_REV}/${SCRIPT_PATH}
+wget --directory-prefix=${SCRIPT_DOWNLOAD_PATH} $url
diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
index 694e56a15e90..eff2b7dc56f2 100644
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -167,11 +167,6 @@ config = {
},
# local mochi suites
"all_mochitest_suites": {
- "plain1": ["--total-chunks=5", "--this-chunk=1", "--chunk-by-dir=4"],
- "plain2": ["--total-chunks=5", "--this-chunk=2", "--chunk-by-dir=4"],
- "plain3": ["--total-chunks=5", "--this-chunk=3", "--chunk-by-dir=4"],
- "plain4": ["--total-chunks=5", "--this-chunk=4", "--chunk-by-dir=4"],
- "plain5": ["--total-chunks=5", "--this-chunk=5", "--chunk-by-dir=4"],
"plain": [],
"plain-chunked": ["--chunk-by-dir=4"],
"mochitest-push": ["--subsuite=push"],
diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py
index f2c2a70cb240..6297ada8cc9f 100644
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -134,11 +134,6 @@ config = {
},
# local mochi suites
"all_mochitest_suites": {
- "plain1": ["--total-chunks=5", "--this-chunk=1", "--chunk-by-dir=4"],
- "plain2": ["--total-chunks=5", "--this-chunk=2", "--chunk-by-dir=4"],
- "plain3": ["--total-chunks=5", "--this-chunk=3", "--chunk-by-dir=4"],
- "plain4": ["--total-chunks=5", "--this-chunk=4", "--chunk-by-dir=4"],
- "plain5": ["--total-chunks=5", "--this-chunk=5", "--chunk-by-dir=4"],
"plain": [],
"plain-chunked": ["--chunk-by-dir=4"],
"mochitest-push": ["--subsuite=push"],
diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
index d7d658b4ba7e..64254f3ab715 100644
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -143,11 +143,6 @@ config = {
# local mochi suites
"all_mochitest_suites":
{
- "plain1": ["--total-chunks=5", "--this-chunk=1", "--chunk-by-dir=4"],
- "plain2": ["--total-chunks=5", "--this-chunk=2", "--chunk-by-dir=4"],
- "plain3": ["--total-chunks=5", "--this-chunk=3", "--chunk-by-dir=4"],
- "plain4": ["--total-chunks=5", "--this-chunk=4", "--chunk-by-dir=4"],
- "plain5": ["--total-chunks=5", "--this-chunk=5", "--chunk-by-dir=4"],
"plain": [],
"plain-chunked": ["--chunk-by-dir=4"],
"mochitest-push": ["--subsuite=push"],
diff --git a/testing/taskcluster/tasks/build.yml b/testing/taskcluster/tasks/build.yml
index 76d85f11b422..a97247e43d3b 100644
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -52,7 +52,7 @@ task:
GECKO_HEAD_REPOSITORY: '{{head_repository}}'
GECKO_HEAD_REV: '{{head_rev}}'
GECKO_HEAD_REF: '{{head_ref}}'
- TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool'
+ TOOLTOOL_REPO: 'https://git.mozilla.org/build/tooltool.git'
TOOLTOOL_REV: 'master'
extra: