Bug 1275409: move legacy taskcluster-related scripts to taskcluster/scripts; r=wcosta
authorDustin J. Mitchell <dustin@mozilla.com>
Sat, 04 Jun 2016 22:57:41 +0000
changeset 343192 d503738745c7637beb31d420d211e550d3c309b6
parent 343191 c192b9b76fba1854297d9999ea3bdccd5efb43f4
child 343193 5a2c10a250035268cfb69065d10eb01471091aff
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1275409
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1275409: move legacy taskcluster-related scripts to taskcluster/scripts; r=wcosta MozReview-Commit-ID: 7ilVJkNAPvE
js/src/devtools/rootAnalysis/README.md
js/src/devtools/rootAnalysis/run-analysis.sh
mobile/android/config/mozconfigs/common
taskcluster/ci/legacy/tasks/branches/base_jobs.yml
taskcluster/ci/legacy/tasks/builds/b2g_aries_spark_debug.yml
taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_eng.yml
taskcluster/ci/legacy/tasks/builds/b2g_phone_eng_base.yml
taskcluster/ci/legacy/tasks/builds/haz_linux.yml
taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
taskcluster/ci/legacy/tasks/builds/linux64_clang.yml
taskcluster/ci/legacy/tasks/builds/linux64_gcc.yml
taskcluster/ci/legacy/tasks/builds/mulet_haz_linux.yml
taskcluster/ci/legacy/tasks/builds/mulet_linux.yml
taskcluster/ci/legacy/tasks/builds/sm_package.yml
taskcluster/ci/legacy/tasks/builds/sm_variant_base.yml
taskcluster/ci/legacy/tasks/tests/harness_marionette.yml
taskcluster/scripts/builder/build-emulator-x86.sh
taskcluster/scripts/builder/build-emulator.sh
taskcluster/scripts/builder/build-haz-linux.sh
taskcluster/scripts/builder/build-linux.sh
taskcluster/scripts/builder/build-mulet-haz-linux.sh
taskcluster/scripts/builder/build-mulet-linux.sh
taskcluster/scripts/builder/build-simulator.sh
taskcluster/scripts/builder/build-sm-package.sh
taskcluster/scripts/builder/build-sm.sh
taskcluster/scripts/builder/desktop-setup.sh
taskcluster/scripts/builder/gaia_props.py
taskcluster/scripts/builder/get-objdir.py
taskcluster/scripts/builder/hazard-analysis.sh
taskcluster/scripts/builder/install-packages.sh
taskcluster/scripts/builder/pull-gaia.sh
taskcluster/scripts/builder/setup-ccache.sh
taskcluster/scripts/builder/sm-tooltool-config.sh
taskcluster/scripts/copy.sh
taskcluster/scripts/misc/build-cctools.sh
taskcluster/scripts/misc/build-clang-linux.sh
taskcluster/scripts/misc/build-gcc-linux.sh
taskcluster/scripts/misc/minidump_stackwalk.sh
taskcluster/scripts/misc/repackage-jdk-centos.sh
taskcluster/scripts/phone-builder/build-dolphin.sh
taskcluster/scripts/phone-builder/build-phone-ota.sh
taskcluster/scripts/phone-builder/build-phone.sh
taskcluster/scripts/phone-builder/post-build.sh
taskcluster/scripts/phone-builder/pre-build.sh
taskcluster/scripts/tester/harness-test-linux.sh
taskcluster/scripts/tester/test-b2g.sh
taskcluster/scripts/tester/test-linux.sh
testing/docker/android-gradle-build/bin/build.sh
testing/docker/desktop-build/bin/build.sh
testing/docker/desktop-test/bin/test.sh
testing/docker/tester/bin/test.sh
testing/taskcluster/scripts/builder/build-emulator-x86.sh
testing/taskcluster/scripts/builder/build-emulator.sh
testing/taskcluster/scripts/builder/build-haz-linux.sh
testing/taskcluster/scripts/builder/build-linux.sh
testing/taskcluster/scripts/builder/build-mulet-haz-linux.sh
testing/taskcluster/scripts/builder/build-mulet-linux.sh
testing/taskcluster/scripts/builder/build-simulator.sh
testing/taskcluster/scripts/builder/build-sm-package.sh
testing/taskcluster/scripts/builder/build-sm.sh
testing/taskcluster/scripts/builder/desktop-setup.sh
testing/taskcluster/scripts/builder/gaia_props.py
testing/taskcluster/scripts/builder/get-objdir.py
testing/taskcluster/scripts/builder/hazard-analysis.sh
testing/taskcluster/scripts/builder/install-packages.sh
testing/taskcluster/scripts/builder/pull-gaia.sh
testing/taskcluster/scripts/builder/setup-ccache.sh
testing/taskcluster/scripts/builder/sm-tooltool-config.sh
testing/taskcluster/scripts/copy.sh
testing/taskcluster/scripts/misc/build-cctools.sh
testing/taskcluster/scripts/misc/build-clang-linux.sh
testing/taskcluster/scripts/misc/build-gcc-linux.sh
testing/taskcluster/scripts/misc/minidump_stackwalk.sh
testing/taskcluster/scripts/misc/repackage-jdk-centos.sh
testing/taskcluster/scripts/phone-builder/build-dolphin.sh
testing/taskcluster/scripts/phone-builder/build-phone-ota.sh
testing/taskcluster/scripts/phone-builder/build-phone.sh
testing/taskcluster/scripts/phone-builder/post-build.sh
testing/taskcluster/scripts/phone-builder/pre-build.sh
testing/taskcluster/scripts/tester/harness-test-linux.sh
testing/taskcluster/scripts/tester/test-b2g.sh
testing/taskcluster/scripts/tester/test-linux.sh
--- a/js/src/devtools/rootAnalysis/README.md
+++ b/js/src/devtools/rootAnalysis/README.md
@@ -18,23 +18,23 @@ 3.  Install taskcluster-vcs, eg by doing
         npm install taskcluster-vcs
         export PATH="$PATH:$(pwd)/node_modules/.bin"
 
 4. In some directory, using $SRCDIR as the top of your Gecko source checkout,
     run these commands:
 
         mkdir work
         cd work
-        GECKO_DIR=$SRCDIR $SRCDIR/testing/taskcluster/scripts/builder/build-haz-linux.sh $(pwd) --dep
+        GECKO_DIR=$SRCDIR $SRCDIR/taskcluster/scripts/builder/build-haz-linux.sh $(pwd) --dep
 
 The `--dep` is optional, and will avoid rebuilding the JS shell used to run the
 analysis later. Output goes to `analysis/hazards.txt`. This will run the
 analysis on the js/src tree only; if you wish to analyze the full browser, use
 
-    GECKO_DIR=$SRCDIR $SRCDIR/testing/taskcluster/scripts/builder/build-haz-linux.sh --project browser $(pwd)
+    GECKO_DIR=$SRCDIR $SRCDIR/taskcluster/scripts/builder/build-haz-linux.sh --project browser $(pwd)
 
 After running the analysis once, you can reuse the `*.xdb` database files
 generated, using modified analysis scripts, by running
 `analysis/run-analysis.sh` (or pass `--list` to see ways to select even more
 restrictive parts of the overall analysis; the default is `gcTypes` which will
 do everything but regenerate the xdb files).
 
 Also, you can pass `-v` to get exact command lines to cut & paste for running the
--- a/js/src/devtools/rootAnalysis/run-analysis.sh
+++ b/js/src/devtools/rootAnalysis/run-analysis.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 SRCDIR=$(cd $(dirname $0)/../../../..; pwd)
-GECKO_DIR=$SRCDIR $SRCDIR/testing/taskcluster/scripts/builder/build-haz-linux.sh $(pwd) "$@"
+GECKO_DIR=$SRCDIR $SRCDIR/taskcluster/scripts/builder/build-haz-linux.sh $(pwd) "$@"
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -12,17 +12,17 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 # In TaskCluster, the Java JRE/JDK are installed from tooltool, but that
 # install doesn't work on the old Buildbot mock builders (CentOS 6.2), so
 # the relevant env vars are not set up in that case, leaving the build to
 # run from the JRE/JDK in /usr/lib/jvm.
 if [ ! -f /etc/redhat-release ] || [ "$(< /etc/redhat-release)" != "CentOS release 6.2 (Final)" ]; then
     # set JAVA_HOME to find the JRE/JDK from tooltool.  Several scripts in the JDK
     # assume `java` is in PATH, so set that too.  To see how this tarball is built,
-    # see testing/taskcluster/scripts/misc/repackage-jdk.sh
+    # see taskcluster/scripts/misc/repackage-jdk.sh
     export JAVA_HOME="$topsrcdir/java_home"
     export PATH="$PATH:$topsrcdir/java_home/bin"
 
     mk_add_options "export JAVA_HOME=$topsrcdir/java_home"
     mk_add_options "export PATH=$PATH:$topsrcdir/java_home/bin"
 fi
 
 # Set the most aggressive settings for szip. Not the default because it's
--- a/taskcluster/ci/legacy/tasks/branches/base_jobs.yml
+++ b/taskcluster/ci/legacy/tasks/branches/base_jobs.yml
@@ -592,16 +592,16 @@ tasks:
           - 'testing/marionette/harness/**'
           - 'testing/mozharness/scripts/marionette_harness_tests.py'
   linux64-gcc:
     task: tasks/builds/linux64_gcc.yml
     root: true
     when:
         file_patterns:
           - 'build/unix/build-gcc/**'
-          - 'testing/taskcluster/scripts/misc/build-gcc-linux.sh'
+          - 'taskcluster/scripts/misc/build-gcc-linux.sh'
   linux64-clang:
     task: tasks/builds/linux64_clang.yml
     root: true
     when:
         file_patterns:
           - 'build/build-clang/**'
-          - 'testing/taskcluster/scripts/misc/build-clang-linux.sh'
+          - 'taskcluster/scripts/misc/build-clang-linux.sh'
--- a/taskcluster/ci/legacy/tasks/builds/b2g_aries_spark_debug.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_aries_spark_debug.yml
@@ -20,17 +20,17 @@ task:
       DEBUG: 0
       VARIANT: userdebug
       GAIA_OPTIMIZE: '1'
       B2G_SYSTEM_APPS: '1'
       MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
     command:
       - >
         checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        cd ./workspace/gecko/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       symbol: B
       groupSymbol: Aries
--- a/taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_eng.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_eng.yml
@@ -15,17 +15,17 @@ task:
       level-{{level}}-{{project}}-build-nexus-5-l-eng: /home/worker/object-folder
       level-{{level}}-{{project}}-build-nexus-5-l-eng-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'nexus-5-l'
       DEBUG: 0
     command:
       - >
         checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        cd ./workspace/gecko/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-phone.sh $HOME/workspace
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       symbol: Be
       groupSymbol: Nexus 5-L
--- a/taskcluster/ci/legacy/tasks/builds/b2g_phone_eng_base.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_phone_eng_base.yml
@@ -11,10 +11,10 @@ task:
       B2G_SYSTEM_APPS: '1'
       MOZ_TELEMETRY_REPORTING: '1'
       MOZ_CRASHREPORTER_NO_REPORT: '1'
       GAIA_KEYBOARD_LAYOUTS: 'en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak'
       B2G_UPDATE_CHANNEL: 'default'
     command:
       - >
         checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        cd ./workspace/gecko/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-phone.sh $HOME/workspace
--- a/taskcluster/ci/legacy/tasks/builds/haz_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/haz_linux.yml
@@ -30,17 +30,17 @@ task:
 
     maxRunTime: 36000
 
     command:
       - /bin/bash
       - -c
       - >
         tc-vcs checkout workspace/gecko "$GECKO_BASE_REPOSITORY" "$GECKO_HEAD_REPOSITORY" "$GECKO_HEAD_REV" "$GECKO_HEAD_REF" &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        cd ./workspace/gecko/taskcluster/scripts/builder &&
         ./build-haz-linux.sh --project browser $HOME/workspace
 
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       machine:
--- a/taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
@@ -29,17 +29,17 @@ task:
 
     maxRunTime: 36000
 
     command:
       - /bin/bash
       - -c
       - >
         tc-vcs checkout workspace/gecko "$GECKO_BASE_REPOSITORY" "$GECKO_HEAD_REPOSITORY" "$GECKO_HEAD_REV" "$GECKO_HEAD_REF" &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        cd ./workspace/gecko/taskcluster/scripts/builder &&
         ./build-haz-linux.sh --project shell $HOME/workspace
 
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       machine:
--- a/taskcluster/ci/legacy/tasks/builds/linux64_clang.yml
+++ b/taskcluster/ci/legacy/tasks/builds/linux64_clang.yml
@@ -23,17 +23,17 @@ task:
 
     env:
       MOZHARNESS_DISABLE: 'true'
       TOOLS_DISABLE: 'true'
       TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
 
     maxRunTime: 36000
 
-    command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/misc/build-clang-linux.sh" ]
+    command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/misc/build-clang-linux.sh" ]
 
     artifacts:
       'public/clang.tar.xz':
         type: file
         path: '/home/worker/workspace/artifacts/clang.tar.xz'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
--- a/taskcluster/ci/legacy/tasks/builds/linux64_gcc.yml
+++ b/taskcluster/ci/legacy/tasks/builds/linux64_gcc.yml
@@ -16,17 +16,17 @@ task:
 
   payload:
     env:
       MOZHARNESS_DISABLE: 'true'
       TOOLS_DISABLE: 'true'
 
     maxRunTime: 36000
 
-    command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/misc/build-gcc-linux.sh" ]
+    command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/misc/build-gcc-linux.sh" ]
 
     artifacts:
       'public/gcc.tar.xz':
         type: file
         path: '/home/worker/workspace/artifacts/gcc.tar.xz'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
--- a/taskcluster/ci/legacy/tasks/builds/mulet_haz_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/mulet_haz_linux.yml
@@ -33,17 +33,17 @@ task:
 
     maxRunTime: 36000
 
     command:
       - /bin/bash
       - -c
       - >
         checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        cd ./workspace/gecko/taskcluster/scripts/builder &&
         buildbot_step 'Build' ./build-mulet-haz-linux.sh $HOME/workspace
 
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       groupSymbol: "tc"
--- a/taskcluster/ci/legacy/tasks/builds/mulet_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/mulet_linux.yml
@@ -33,17 +33,17 @@ task:
 
     maxRunTime: 3600
 
     command:
       - /bin/bash
       - -c
       - >
         checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        cd ./workspace/gecko/taskcluster/scripts/builder &&
         buildbot_step 'Build' ./build-mulet-linux.sh $HOME/workspace
 
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       # Disable "TC" prefix...
--- a/taskcluster/ci/legacy/tasks/builds/sm_package.yml
+++ b/taskcluster/ci/legacy/tasks/builds/sm_package.yml
@@ -3,16 +3,16 @@
   variables:
     build_name: 'sm-package'
     build_type: 'opt'
 task:
   payload:
     env:
       SPIDERMONKEY_VARIANT: 'plain'
 
-    command: [ "/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/builder/build-sm-package.sh" ]
+    command: [ "/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/builder/build-sm-package.sh" ]
 
   metadata:
     name: '[TC] Spidermonkey Package'
     description: 'Spidermonkey Package'
   extra:
     treeherder:
       symbol: pkg
--- a/taskcluster/ci/legacy/tasks/builds/sm_variant_base.yml
+++ b/taskcluster/ci/legacy/tasks/builds/sm_variant_base.yml
@@ -1,5 +1,5 @@
 $inherits:
   from: 'tasks/builds/sm_base.yml'
 task:
   payload:
-    command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/builder/build-sm.sh" ]
+    command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/builder/build-sm.sh" ]
--- a/taskcluster/ci/legacy/tasks/tests/harness_marionette.yml
+++ b/taskcluster/ci/legacy/tasks/tests/harness_marionette.yml
@@ -12,17 +12,17 @@ task:
     description: 'Marionette harness unit test'
 
   payload:
     command:
       - --tests=testing/marionette/harness/marionette/tests/harness_unit
       # Avoid overwriting /home/workspace/build/src
       - --work-dir=mozharness_workspace
     env:
-      JOB_SCRIPT: 'testing/taskcluster/scripts/tester/harness-test-linux.sh'
+      JOB_SCRIPT: 'taskcluster/scripts/tester/harness-test-linux.sh'
       MOZHARNESS_SCRIPT: >
           testing/mozharness/scripts/marionette_harness_tests.py
     artifacts:
       'public/logs/':
         type: directory
         path: '/home/worker/workspace/mozharness_workspace/upload/logs/'
         expires: '{{#from_now}}1 year{{/from_now}}'
   extra:
rename from testing/taskcluster/scripts/builder/build-emulator-x86.sh
rename to taskcluster/scripts/builder/build-emulator-x86.sh
rename from testing/taskcluster/scripts/builder/build-emulator.sh
rename to taskcluster/scripts/builder/build-emulator.sh
rename from testing/taskcluster/scripts/builder/build-haz-linux.sh
rename to taskcluster/scripts/builder/build-haz-linux.sh
rename from testing/taskcluster/scripts/builder/build-linux.sh
rename to taskcluster/scripts/builder/build-linux.sh
rename from testing/taskcluster/scripts/builder/build-mulet-haz-linux.sh
rename to taskcluster/scripts/builder/build-mulet-haz-linux.sh
rename from testing/taskcluster/scripts/builder/build-mulet-linux.sh
rename to taskcluster/scripts/builder/build-mulet-linux.sh
rename from testing/taskcluster/scripts/builder/build-simulator.sh
rename to taskcluster/scripts/builder/build-simulator.sh
rename from testing/taskcluster/scripts/builder/build-sm-package.sh
rename to taskcluster/scripts/builder/build-sm-package.sh
rename from testing/taskcluster/scripts/builder/build-sm.sh
rename to taskcluster/scripts/builder/build-sm.sh
rename from testing/taskcluster/scripts/builder/desktop-setup.sh
rename to taskcluster/scripts/builder/desktop-setup.sh
rename from testing/taskcluster/scripts/builder/gaia_props.py
rename to taskcluster/scripts/builder/gaia_props.py
rename from testing/taskcluster/scripts/builder/get-objdir.py
rename to taskcluster/scripts/builder/get-objdir.py
rename from testing/taskcluster/scripts/builder/hazard-analysis.sh
rename to taskcluster/scripts/builder/hazard-analysis.sh
rename from testing/taskcluster/scripts/builder/install-packages.sh
rename to taskcluster/scripts/builder/install-packages.sh
rename from testing/taskcluster/scripts/builder/pull-gaia.sh
rename to taskcluster/scripts/builder/pull-gaia.sh
rename from testing/taskcluster/scripts/builder/setup-ccache.sh
rename to taskcluster/scripts/builder/setup-ccache.sh
rename from testing/taskcluster/scripts/builder/sm-tooltool-config.sh
rename to taskcluster/scripts/builder/sm-tooltool-config.sh
rename from testing/taskcluster/scripts/copy.sh
rename to taskcluster/scripts/copy.sh
rename from testing/taskcluster/scripts/misc/build-cctools.sh
rename to taskcluster/scripts/misc/build-cctools.sh
rename from testing/taskcluster/scripts/misc/build-clang-linux.sh
rename to taskcluster/scripts/misc/build-clang-linux.sh
rename from testing/taskcluster/scripts/misc/build-gcc-linux.sh
rename to taskcluster/scripts/misc/build-gcc-linux.sh
rename from testing/taskcluster/scripts/misc/minidump_stackwalk.sh
rename to taskcluster/scripts/misc/minidump_stackwalk.sh
rename from testing/taskcluster/scripts/misc/repackage-jdk-centos.sh
rename to taskcluster/scripts/misc/repackage-jdk-centos.sh
rename from testing/taskcluster/scripts/phone-builder/build-dolphin.sh
rename to taskcluster/scripts/phone-builder/build-dolphin.sh
rename from testing/taskcluster/scripts/phone-builder/build-phone-ota.sh
rename to taskcluster/scripts/phone-builder/build-phone-ota.sh
rename from testing/taskcluster/scripts/phone-builder/build-phone.sh
rename to taskcluster/scripts/phone-builder/build-phone.sh
rename from testing/taskcluster/scripts/phone-builder/post-build.sh
rename to taskcluster/scripts/phone-builder/post-build.sh
rename from testing/taskcluster/scripts/phone-builder/pre-build.sh
rename to taskcluster/scripts/phone-builder/pre-build.sh
rename from testing/taskcluster/scripts/tester/harness-test-linux.sh
rename to taskcluster/scripts/tester/harness-test-linux.sh
rename from testing/taskcluster/scripts/tester/test-b2g.sh
rename to taskcluster/scripts/tester/test-b2g.sh
rename from testing/taskcluster/scripts/tester/test-linux.sh
rename to taskcluster/scripts/tester/test-linux.sh
--- a/testing/docker/android-gradle-build/bin/build.sh
+++ b/testing/docker/android-gradle-build/bin/build.sh
@@ -21,9 +21,9 @@ fi
 
 ####
 # The default build works for any fx_desktop_build based mozharness job:
 # via linux-build.sh
 ####
 
 . $HOME/bin/checkout-sources.sh
 
-. $WORKSPACE/build/src/testing/taskcluster/scripts/builder/build-linux.sh
+. $WORKSPACE/build/src/taskcluster/scripts/builder/build-linux.sh
--- a/testing/docker/desktop-build/bin/build.sh
+++ b/testing/docker/desktop-build/bin/build.sh
@@ -1,14 +1,14 @@
 #! /bin/bash -vex
 
 set -x -e -v
 
 # Relative path to in-tree script
-: JOB_SCRIPT                ${JOB_SCRIPT:=testing/taskcluster/scripts/builder/build-linux.sh}
+: JOB_SCRIPT                ${JOB_SCRIPT:=taskcluster/scripts/builder/build-linux.sh}
 
 script_args="${@}"
 
 # TODO: when bug 1093833 is solved and tasks can run as non-root, reduce this
 # to a simple fail-if-root check
 if [ $(id -u) = 0 ]; then
     # each of the caches we have mounted are owned by root, so update that ownership
     # to 'worker'
--- a/testing/docker/desktop-test/bin/test.sh
+++ b/testing/docker/desktop-test/bin/test.sh
@@ -24,15 +24,15 @@ fail() {
 ####
 # Now get the test-linux.sh script from the given Gecko tree and run it with
 # the same arguments.
 ####
 
 [ -d $WORKSPACE ] || mkdir -p $WORKSPACE
 cd $WORKSPACE
 
-script=testing/taskcluster/scripts/tester/test-linux.sh
+script=taskcluster/scripts/tester/test-linux.sh
 url=${GECKO_HEAD_REPOSITORY}/raw-file/${GECKO_HEAD_REV}/${script}
 if ! curl --fail -o ./test-linux.sh --retry 10 $url; then
     fail "failed downloading test-linux.sh from ${GECKO_HEAD_REPOSITORY}"
 fi
 chmod +x ./test-linux.sh
 exec ./test-linux.sh "${@}"
--- a/testing/docker/tester/bin/test.sh
+++ b/testing/docker/tester/bin/test.sh
@@ -18,14 +18,14 @@ fi
 ####
 # Now get the test-linux.sh script from the given Gecko tree and run it with
 # the same arguments.
 ####
 
 [ -d $WORKSPACE ] || mkdir -p $WORKSPACE
 cd $WORKSPACE
 
-script=testing/taskcluster/scripts/tester/test-b2g.sh
+script=taskcluster/scripts/tester/test-b2g.sh
 url=${GECKO_HEAD_REPOSITORY}/raw-file/${GECKO_HEAD_REV}/${script}
 curl --fail -o ./test-b2g.sh --retry 10 $url
 chmod +x ./test-b2g.sh
 exec ./test-b2g.sh "${@}"