Backed out changeset feedcde68c2a (bug 1338651) for bustage

2017-06-30 09:41:23 +02:00 · 2017-06-30 09:41:23 +02:00 · f6130d3fe8
--- a/build/build-clang/clang-static-analysis-linux64.json
+++ b/build/build-clang/clang-static-analysis-linux64.json
@ -10,10 +10,10 @@
    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_390/final",
    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_390/final",
    "python_path": "/usr/bin/python2.7",
-    "gcc_dir": "/builds/worker/workspace/build/src/gcc",
-    "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
-    "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
-    "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
+    "gcc_dir": "/home/worker/workspace/build/src/gcc",
+    "cc": "/home/worker/workspace/build/src/gcc/bin/gcc",
+    "cxx": "/home/worker/workspace/build/src/gcc/bin/g++",
+    "as": "/home/worker/workspace/build/src/gcc/bin/gcc",
    "patches": [
      "llvm-debug-frame.patch",
      "r277806.patch",
--- a/build/build-clang/clang-static-analysis-macosx64.json
+++ b/build/build-clang/clang-static-analysis-macosx64.json
@ -11,14 +11,14 @@
    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_390/final",
    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_390/final",
    "python_path": "/usr/bin/python2.7",
-    "gcc_dir": "/builds/worker/workspace/build/src/gcc",
-    "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
-    "as": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
-    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
-    "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-libtool",
-    "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
+    "gcc_dir": "/home/worker/workspace/build/src/gcc",
+    "cc": "/home/worker/workspace/build/src/clang/bin/clang",
+    "cxx": "/home/worker/workspace/build/src/clang/bin/clang++",
+    "as": "/home/worker/workspace/build/src/clang/bin/clang",
+    "ar": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
+    "ranlib": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
+    "libtool": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-libtool",
+    "ld": "/home/worker/workspace/build/src/clang/bin/clang",
    "patches":[
      "llvm-debug-frame.patch",
      "compiler-rt-cross-compile.patch",
--- a/build/build-clang/clang-tidy-linux64.json
+++ b/build/build-clang/clang-tidy-linux64.json
@ -12,8 +12,8 @@
    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/trunk",
    "python_path": "/usr/bin/python2.7",
-    "gcc_dir": "/builds/worker/workspace/build/src/gcc",
-    "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
-    "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
-    "as": "/builds/worker/workspace/build/src/gcc/bin/gcc"
+    "gcc_dir": "/home/worker/workspace/build/src/gcc",
+    "cc": "/home/worker/workspace/build/src/gcc/bin/gcc",
+    "cxx": "/home/worker/workspace/build/src/gcc/bin/g++",
+    "as": "/home/worker/workspace/build/src/gcc/bin/gcc"
 }
--- a/build/build-clang/clang-tidy-macosx64.json
+++ b/build/build-clang/clang-tidy-macosx64.json
@ -13,13 +13,13 @@
    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/trunk",
    "python_path": "/usr/bin/python2.7",
-    "gcc_dir": "/builds/worker/workspace/build/src/gcc",
-    "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
-    "as": "/builds/worker/workspace/build/src/clang/bin/clang",
-    "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
-    "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
-    "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
+    "gcc_dir": "/home/worker/workspace/build/src/gcc",
+    "cc": "/home/worker/workspace/build/src/clang/bin/clang",
+    "cxx": "/home/worker/workspace/build/src/clang/bin/clang++",
+    "as": "/home/worker/workspace/build/src/clang/bin/clang",
+    "ar": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
+    "ranlib": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
+    "ld": "/home/worker/workspace/build/src/clang/bin/clang",
    "patches": [
      "llvm-debug-frame.patch",
      "compiler-rt-cross-compile.patch"
--- a/taskcluster/actions/registry.py
+++ b/taskcluster/actions/registry.py
@ -200,7 +200,7 @@ def register_callback_action(title, symbol, description, order=10000, context=[]
                        'GECKO_HEAD_REPOSITORY': parameters['head_repository'],
                        'GECKO_HEAD_REF': parameters['head_ref'],
                        'GECKO_HEAD_REV': parameters['head_rev'],
-                        'HG_STORE_PATH': '/builds/worker/checkouts/hg-store',
+                        'HG_STORE_PATH': '/home/worker/checkouts/hg-store',
                        'ACTION_TASK_GROUP_ID': {'$eval': 'taskGroupId'},
                        'ACTION_TASK_ID': {'$dumps': {'$eval': 'taskId'}},
                        'ACTION_TASK': {'$dumps': {'$eval': 'task'}},
@ -210,7 +210,7 @@ def register_callback_action(title, symbol, description, order=10000, context=[]
                    },
                    'cache': {
                        'level-{}-checkouts'.format(parameters['level']):
-                            '/builds/worker/checkouts',
+                            '/home/worker/checkouts',
                    },
                    'features': {
                        'taskclusterProxy': True,
@ -219,12 +219,11 @@ def register_callback_action(title, symbol, description, order=10000, context=[]
                    'image': docker_image('decision'),
                    'maxRunTime': 1800,
                    'command': [
-                        '/builds/worker/bin/run-task',
-                        '--vcs-checkout=/builds/worker/checkouts/gecko',
+                        '/home/worker/bin/run-task', '--vcs-checkout=/home/worker/checkouts/gecko',
                        '--', 'bash', '-cx',
                        """\
-cd /builds/worker/checkouts/gecko &&
-ln -s /builds/worker/artifacts artifacts &&
+cd /home/worker/checkouts/gecko &&
+ln -s /home/worker/artifacts artifacts &&
 ./mach --log-no-times taskgraph action-callback""",
                    ],
                },
--- a/taskcluster/ci/android-stuff/kind.yml
+++ b/taskcluster/ci/android-stuff/kind.yml
@ -30,7 +30,7 @@ jobs:
            os: linux
            docker-image: {in-tree: android-gradle-build}
            env:
-                GRADLE_USER_HOME: "/builds/worker/workspace/build/src/dotgradle-online"
+                GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle-online"
                MH_BUILD_POOL: "taskcluster"
                MH_CUSTOM_BUILD_VARIANT_CFG: "api-15-gradle-dependencies"
                MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
@ -39,21 +39,21 @@ jobs:
                    disable_signing.py
                    platform_supports_post_upload_to_latest.py
                MOZHARNESS_SCRIPT: "mozharness/scripts/fx_desktop_build.py"
-                TOOLTOOL_CACHE: "/builds/worker/tooltool-cache"
+                TOOLTOOL_CACHE: "/home/worker/tooltool-cache"
                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest"
            artifacts:
              - name: public/build
-                path: /builds/worker/artifacts/
+                path: /home/worker/artifacts/
                type: directory
            caches:
              - name: tooltool-cache
-                mount-point: /builds/worker/tooltool-cache
+                mount-point: /home/worker/tooltool-cache
                type: persistent
            relengapi-proxy: true
            command:
              - "/bin/bash"
              - "-c"
-              - "/builds/worker/bin/before.sh && /builds/worker/bin/build.sh && /builds/worker/bin/after.sh && true\n"
+              - "/home/worker/bin/before.sh && /home/worker/bin/build.sh && /home/worker/bin/after.sh && true\n"
            max-run-time: 36000
        scopes:
          - docker-worker:relengapi-proxy:tooltool.download.internal
@ -77,7 +77,7 @@ jobs:
            os: linux
            docker-image: {in-tree: desktop-build}
            env:
-                GRADLE_USER_HOME: "/builds/worker/workspace/build/src/dotgradle"
+                GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
                MH_BUILD_POOL: "taskcluster"
                MH_CUSTOM_BUILD_VARIANT_CFG: "android-test"
                MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
@ -89,14 +89,14 @@ jobs:
                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/unittest
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/tests
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/tests
                type: directory
              - name: public/build
-                path: /builds/worker/artifacts/
+                path: /home/worker/artifacts/
                type: directory
            caches:
              - name: tooltool-cache
-                mount-point: /builds/worker/tooltool-cache
+                mount-point: /home/worker/tooltool-cache
                type: persistent
            relengapi-proxy: true
            command:
@ -125,7 +125,7 @@ jobs:
            os: linux
            docker-image: {in-tree: desktop-build}
            env:
-                GRADLE_USER_HOME: "/builds/worker/workspace/build/src/dotgradle"
+                GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
                MH_BUILD_POOL: "taskcluster"
                MH_CUSTOM_BUILD_VARIANT_CFG: "android-lint"
                MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
@ -137,29 +137,29 @@ jobs:
                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/lint/lint-results-officialAustralisDebug.html
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug.html
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug.html
                type: file
              - name: public/android/lint/lint-results-officialAustralisDebug.xml
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug.xml
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug.xml
                type: file
              - name: public/android/lint/lint-results-officialAustralisDebug_files
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug_files
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialAustralisDebug_files
                type: directory
              - name: public/android/lint/lint-results-officialPhotonDebug.html
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialPhotonDebug.html
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialPhotonDebug.html
                type: file
              - name: public/android/lint/lint-results-officialPhotonDebug.xml
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialPhotonDebug.xml
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialPhotonDebug.xml
                type: file
              - name: public/android/lint/lint-results-officialPhotonDebug_files
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialPhotonDebug_files
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/lint-results-officialPhotonDebug_files
                type: directory
              - name: public/build
-                path: /builds/worker/artifacts/
+                path: /home/worker/artifacts/
                type: directory
            caches:
              - name: tooltool-cache
-                mount-point: /builds/worker/tooltool-cache
+                mount-point: /home/worker/tooltool-cache
                type: persistent
            relengapi-proxy: true
            command:
@ -195,7 +195,7 @@ jobs:
            os: linux
            docker-image: {in-tree: desktop-build}
            env:
-                GRADLE_USER_HOME: "/builds/worker/workspace/build/src/dotgradle"
+                GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
                MH_BUILD_POOL: "taskcluster"
                MH_CUSTOM_BUILD_VARIANT_CFG: "android-checkstyle"
                MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
@ -207,14 +207,14 @@ jobs:
                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/checkstyle/checkstyle.xml
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/checkstyle/checkstyle.xml
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/reports/checkstyle/checkstyle.xml
                type: file
              - name: public/build
-                path: /builds/worker/artifacts/
+                path: /home/worker/artifacts/
                type: directory
            caches:
              - name: tooltool-cache
-                mount-point: /builds/worker/tooltool-cache
+                mount-point: /home/worker/tooltool-cache
                type: persistent
            relengapi-proxy: true
            command:
@ -246,7 +246,7 @@ jobs:
            os: linux
            docker-image: {in-tree: desktop-build}
            env:
-                GRADLE_USER_HOME: "/builds/worker/workspace/build/src/dotgradle"
+                GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
                MH_BUILD_POOL: "taskcluster"
                MH_CUSTOM_BUILD_VARIANT_CFG: "android-findbugs"
                MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
@ -258,17 +258,17 @@ jobs:
                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-frontend/releng.manifest"
            artifacts:
              - name: public/android/findbugs/findbugs-officialAustralisDebug-output.html
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/findbugs/findbugs-officialAustralisDebug-output.html
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/findbugs/findbugs-officialAustralisDebug-output.html
                type: file
              - name: public/android/findbugs/findbugs-officialPhotonDebug-output.html
-                path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/findbugs/findbugs-officialPhotonDebug-output.html
+                path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/outputs/findbugs/findbugs-officialPhotonDebug-output.html
                type: file
              - name: public/build
-                path: /builds/worker/artifacts/
+                path: /home/worker/artifacts/
                type: directory
            caches:
              - name: tooltool-cache
-                mount-point: /builds/worker/tooltool-cache
+                mount-point: /home/worker/tooltool-cache
                type: persistent
            relengapi-proxy: true
            command:
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@ -257,17 +257,17 @@ android-api-15-gradle/opt:
        max-run-time: 7200
        env:
            # Bug 1292762 - Set GRADLE_USER_HOME to avoid sdk-manager-plugin intermittent
-            GRADLE_USER_HOME: /builds/worker/workspace/build/src/dotgradle
+            GRADLE_USER_HOME: /home/worker/workspace/build/src/dotgradle
            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
        artifacts:
          - name: public/android/maven
-            path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+            path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
            type: directory
          - name: public/build/geckoview_example.apk
-            path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/geckoview_example-withGeckoBinaries.apk
+            path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/geckoview_example-withGeckoBinaries.apk
            type: file
          - name: public/build
-            path: /builds/worker/artifacts/
+            path: /home/worker/artifacts/
            type: directory
    run:
        using: mozharness
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@ -33,7 +33,7 @@ jobs:
        run:
            using: hazard
            command: >
-                cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
+                cd /home/worker/checkouts/gecko/taskcluster/scripts/builder
                && ./build-haz-linux.sh --project shell $HOME/workspace
        when:
            files-changed:
@ -55,5 +55,5 @@ jobs:
            using: hazard
            mozconfig: "browser/config/mozconfigs/linux64/hazards"
            command: >
-                cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
+                cd /home/worker/checkouts/gecko/taskcluster/scripts/builder
                && ./build-haz-linux.sh --project browser $HOME/workspace
--- a/taskcluster/ci/nightly-fennec/docker_build.yml
+++ b/taskcluster/ci/nightly-fennec/docker_build.yml
@ -12,12 +12,12 @@ task:
  payload:

    cache:
-      level-{{level}}-{{project}}-tc-vcs: '/builds/worker/.tc-vcs'
+      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'

    # All docker builds share a common artifact directory for ease of uploading.
    artifacts:
      'public/build':
        type: directory
-        path: '/builds/worker/artifacts/'
+        path: '/home/worker/artifacts/'
        expires:
          relative-datestamp: '1 year'
--- a/taskcluster/ci/source-test/doc.yml
+++ b/taskcluster/ci/source-test/doc.yml
@ -12,11 +12,11 @@ sphinx:
        artifacts:
            - type: file
              name: public/docs.tar.gz
-              path: /builds/worker/checkouts/gecko/docs.tar.gz
+              path: /home/worker/checkouts/gecko/docs.tar.gz
    run:
        using: run-task
        command: >
-            cd /builds/worker/checkouts/gecko &&
+            cd /home/worker/checkouts/gecko &&
            ./mach doc --outdir docs-out --no-open &&
            rm -rf docs-out/html/Mozilla_Source_Tree_Docs/_venv &&
            mv docs-out/html/Mozilla_Source_Tree_Docs docs &&
--- a/taskcluster/ci/source-test/mozlint.yml
+++ b/taskcluster/ci/source-test/mozlint.yml
@ -12,7 +12,7 @@ mozlint-eslint:
    run:
        using: run-task
        command: >
-            cd /builds/worker/checkouts/gecko/ &&
+            cd /home/worker/checkouts/gecko/ &&
            /build/tooltool.py fetch -m tools/lint/eslint/manifest.tt &&
            tar xvfz eslint.tar.gz &&
            rm eslint.tar.gz &&
--- a/taskcluster/ci/source-test/python-tests.yml
+++ b/taskcluster/ci/source-test/python-tests.yml
@ -63,9 +63,9 @@ mochitest-harness:
    run:
        using: run-task
        command: >
-            source /builds/worker/scripts/xvfb.sh &&
+            source /home/worker/scripts/xvfb.sh &&
            start_xvfb '1600x1200x24' 0 &&
-            cd /builds/worker/checkouts/gecko &&
+            cd /home/worker/checkouts/gecko &&
            ./mach python-test --subsuite mochitest
    when:
        files-changed:
@ -117,7 +117,7 @@ mozharness:
        using: run-task
        cache-dotcache: true
        command: >
-            cd /builds/worker/checkouts/gecko/testing/mozharness &&
+            cd /home/worker/checkouts/gecko/testing/mozharness &&
            /usr/local/bin/tox -e py27-hg4.1
    when:
        files-changed:
--- a/taskcluster/docker/android-gradle-build/Dockerfile
+++ b/taskcluster/docker/android-gradle-build/Dockerfile
@ -1,24 +1,24 @@
 # TODO remove VOLUME below when the base image is updated next.
-FROM          taskcluster/centos6-build-upd:0.1.7.201706291036
+FROM          taskcluster/centos6-build-upd:0.1.6.20160329195300
 MAINTAINER    Nick Alexander <nalexander@mozilla.com>

 # BEGIN ../desktop-build/Dockerfile

 # TODO remove when base image is updated
-VOLUME /builds/worker/workspace
-VOLUME /builds/worker/tooltool-cache
+VOLUME /home/worker/workspace
+VOLUME /home/worker/tooltool-cache

 # Add build scripts; these are the entry points from the taskcluster worker, and
 # operate on environment variables
-ADD             bin /builds/worker/bin
-RUN             chmod +x /builds/worker/bin/*
+ADD             bin /home/worker/bin
+RUN             chmod +x /home/worker/bin/*

 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
-ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
+ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /home/worker/scripts/xvfb.sh

 # Add configuration
-COPY            dot-config                    /builds/worker/.config
+COPY            dot-config                    /home/worker/.config

 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
@ -27,12 +27,12 @@ RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
-ADD           oauth.txt /builds/worker/
+ADD           oauth.txt /home/worker/

 # stubbed out buildprops, which keeps mozharness from choking
 # Note that this needs to be in the parent of the workspace directory and in
 # the directory where mozharness is run (not its --work-dir)
-ADD           buildprops.json /builds/worker/
+ADD           buildprops.json /home/worker/

 # install tooltool directly from github where tooltool_wrapper.sh et al. expect
 # to find it
@ -86,11 +86,12 @@ RUN tar zxf nexus-${NEXUS_VERSION}-bundle.tar.gz \
  && rm -rf /tmp/nexus-${NEXUS_VERSION}-bundle.tar.gz

 # Install tooltool directly from github.
+RUN mkdir /build
 ADD https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py /build/tooltool.py
 RUN chmod +rx /build/tooltool.py

 # Back to the centos6-build workdir, matching desktop-build.
-WORKDIR /builds/worker
+WORKDIR /home/worker

 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
--- a/taskcluster/docker/android-gradle-build/VERSION
+++ b/taskcluster/docker/android-gradle-build/VERSION
@ -1 +1 @@
-0.0.2
+0.0.1
--- a/taskcluster/docker/android-gradle-build/bin/after.sh
+++ b/taskcluster/docker/android-gradle-build/bin/after.sh
@ -26,17 +26,17 @@ unzip -q gradle-${GRADLE_VERSION}-all.zip
 mv gradle-${GRADLE_VERSION} gradle-dist
 tar cJf gradle-dist.tar.xz gradle-dist

-mkdir -p /builds/worker/artifacts
+mkdir -p /home/worker/artifacts
 # We can't redistribute the Android SDK publicly just yet.  We'll
 # upload to (internal) tooltool eventually.  mv
-# android-sdk-linux.tar.xz /builds/worker/artifacts
-mv jcentral.tar.xz /builds/worker/artifacts
-mv gradle-dist.tar.xz /builds/worker/artifacts
+# android-sdk-linux.tar.xz /home/worker/artifacts
+mv jcentral.tar.xz /home/worker/artifacts
+mv gradle-dist.tar.xz /home/worker/artifacts
 popd

 # Bug 1245170: at some point in the future, we'll be able to upload
 # things directly to tooltool.
-# pushd /builds/worker/artifacts
+# pushd /home/worker/artifacts
 # /build/tooltool.py add --visibility=public jcentral.tar.xz
 # /build/tooltool.py add --visibility=public gradle-dist.tar.xz
 # /build/tooltool.py add --visibility=internal android-sdk-linux.tar.xz
--- a/taskcluster/docker/android-gradle-build/bin/build.sh
+++ b/taskcluster/docker/android-gradle-build/bin/build.sh
@ -7,7 +7,7 @@ set -x -e -v
 if [ $(id -u) = 0 ]; then
    # each of the caches we have mounted are owned by root, so update that ownership
    # to 'worker'
-    for cache in /builds/worker/.tc-vcs /builds/worker/workspace /builds/worker/tooltool-cache; do
+    for cache in /home/worker/.tc-vcs /home/worker/workspace /home/worker/tooltool-cache; do
        if [ -d $cache ]; then
            # -R probably isn't necessary forever, but it fixes some poisoned
            # caches for now
@ -16,7 +16,7 @@ if [ $(id -u) = 0 ]; then
    done

    # ..then drop privileges by re-running this script
-    exec su worker /builds/worker/bin/build.sh
+    exec su worker /home/worker/bin/build.sh
 fi

 ####
--- a/taskcluster/docker/android-gradle-build/bin/checkout-sources.sh
+++ b/taskcluster/docker/android-gradle-build/bin/checkout-sources.sh
@ -25,7 +25,7 @@ set -x -e
 : TOOLS_HEAD_REF                ${TOOLS_HEAD_REF:=${TOOLS_HEAD_REV}}
 : TOOLS_DISABLE                 ${TOOLS_DISABLE:=false}

-: WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
+: WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}

 set -v

--- a/taskcluster/docker/centos6-build-upd/Dockerfile
+++ b/taskcluster/docker/centos6-build-upd/Dockerfile
@ -1,4 +1,4 @@
-FROM          taskcluster/centos6-build:0.1.7
+FROM          taskcluster/centos6-build:0.1.6
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

 ### update to latest from upstream repositories
--- a/taskcluster/docker/centos6-build-upd/VERSION
+++ b/taskcluster/docker/centos6-build-upd/VERSION
@ -1 +1 @@
-0.1.7.201706291036
+0.1.6.20160329195300
--- a/taskcluster/docker/centos6-build/Dockerfile
+++ b/taskcluster/docker/centos6-build/Dockerfile
@ -1,30 +1,28 @@
 FROM          centos:6
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

-RUN mkdir /builds
-
 ### add worker user and setup its workspace
-RUN useradd -d /builds/worker -s /bin/bash -m worker
+RUN useradd -d /home/worker -s /bin/bash -m worker
 # Declare default working folder
-WORKDIR       /builds/worker
+WORKDIR       /home/worker

 # This will create a host mounted filesystem when the cache is stripped
 # on Try. This cancels out some of the performance losses of aufs. See
 # bug 1291940.
-VOLUME /builds/worker/workspace
-VOLUME /builds/worker/tooltool-cache
+VOLUME /home/worker/workspace
+VOLUME /home/worker/tooltool-cache

 # install non-build specific dependencies in a single layer
 ADD           system-setup.sh   /tmp/system-setup.sh
 RUN           bash /tmp/system-setup.sh

 # Builds need the share module enabled
-ADD           hgrc /builds/worker/.hgrc
-RUN chown -R worker:worker /builds/worker/.hgrc
+ADD           hgrc /home/worker/.hgrc
+RUN chown -R worker:worker /home/worker/.hgrc

 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
-ENV           HOME          /builds/worker
+ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
--- a/taskcluster/docker/centos6-build/VERSION
+++ b/taskcluster/docker/centos6-build/VERSION
@ -1 +1 @@
-0.1.7
+0.1.6
--- a/taskcluster/docker/centos6-build/system-setup.sh
+++ b/taskcluster/docker/centos6-build/system-setup.sh
@ -450,8 +450,8 @@ ln -s /usr/local/bin/ninja /usr/local/bin/ninja-build

 # note that TC will replace workspace with a cache mount; there's no sense
 # creating anything inside there
-mkdir -p /builds/worker/workspace
-chown worker:worker /builds/worker/workspace
+mkdir -p /home/worker/workspace
+chown worker:worker /home/worker/workspace

 # /builds is *not* replaced with a mount in the docker container. The worker
 # user writes to lots of subdirectories, though, so it's owned by that user
--- a/taskcluster/docker/desktop-build/Dockerfile
+++ b/taskcluster/docker/desktop-build/Dockerfile
@ -1,15 +1,15 @@
 # TODO remove VOLUME below when the base image is updated next.
-FROM          taskcluster/centos6-build-upd:0.1.7.201706291036
+FROM          taskcluster/centos6-build-upd:0.1.6.20160329195300
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

 # TODO remove when base image is updated
-VOLUME /builds/worker/workspace
-VOLUME /builds/worker/tooltool-cache
+VOLUME /home/worker/workspace
+VOLUME /home/worker/tooltool-cache

 # Add build scripts; these are the entry points from the taskcluster worker, and
 # operate on environment variables
-ADD             bin /builds/worker/bin
-RUN             chmod +x /builds/worker/bin/*
+ADD             bin /home/worker/bin
+RUN             chmod +x /home/worker/bin/*

 # %include python/mozbuild/mozbuild/action/tooltool.py
 ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /builds/tooltool.py
@ -40,13 +40,13 @@ RUN bash /setup/system-setup.sh

 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
-ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
+ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /home/worker/scripts/xvfb.sh

 # %include taskcluster/docker/recipes/run-task
-ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
+ADD topsrcdir/taskcluster/docker/recipes/run-task /home/worker/bin/run-task

 # Add configuration
-COPY            dot-config                    /builds/worker/.config
+COPY            dot-config                    /home/worker/.config

 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
@ -55,12 +55,12 @@ RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
-ADD           oauth.txt /builds/worker/
+ADD           oauth.txt /home/worker/

 # stubbed out buildprops, which keeps mozharness from choking
 # Note that this needs to be in the parent of the workspace directory and in
 # the directory where mozharness is run (not its --work-dir)
-ADD           buildprops.json /builds/worker/
+ADD           buildprops.json /home/worker/

 # Move installation to base centos6-build image once Bug 1272629 is fixed
 # Install the screen package here to use with xvfb.
--- a/taskcluster/docker/desktop-build/bin/build.sh
+++ b/taskcluster/docker/desktop-build/bin/build.sh
@ -12,7 +12,7 @@ script_args="${@}"
 if [ $(id -u) = 0 ]; then
    # each of the caches we have mounted are owned by root, so update that ownership
    # to 'worker'
-    for cache in /builds/worker/.tc-vcs /builds/worker/workspace /builds/worker/tooltool-cache; do
+    for cache in /home/worker/.tc-vcs /home/worker/workspace /home/worker/tooltool-cache; do
        if [ -d $cache ]; then
            # -R probably isn't necessary forever, but it fixes some poisoned
            # caches for now
@ -21,7 +21,7 @@ if [ $(id -u) = 0 ]; then
    done

    # ..then drop privileges by re-running this script
-    exec su worker -c "/builds/worker/bin/build.sh $script_args"
+    exec su worker -c "/home/worker/bin/build.sh $script_args"
 fi

 ####
--- a/taskcluster/docker/desktop-build/bin/checkout-sources.sh
+++ b/taskcluster/docker/desktop-build/bin/checkout-sources.sh
@ -25,7 +25,7 @@ set -x -e
 : TOOLS_HEAD_REF                ${TOOLS_HEAD_REF:=${TOOLS_HEAD_REV}}
 : TOOLS_DISABLE                 ${TOOLS_DISABLE:=false}

-: WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
+: WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}

 set -v

--- a/taskcluster/docker/desktop-test/Dockerfile
+++ b/taskcluster/docker/desktop-test/Dockerfile
@ -1,9 +1,8 @@
 FROM          ubuntu:12.04
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>

-RUN mkdir /builds
-RUN useradd -d /builds/worker -s /bin/bash -m worker
-WORKDIR /builds/worker
+RUN useradd -d /home/worker -s /bin/bash -m worker
+WORKDIR /home/worker

 # %include python/mozbuild/mozbuild/action/tooltool.py
 ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /setup/tooltool.py
@ -16,7 +15,7 @@ ADD topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /tmp/install-mercu

 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
-ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
+ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /home/worker/scripts/xvfb.sh

 # Add the tooltool manifest containing the minidump_stackwalk binary.
 # %include testing/config/tooltool-manifests/linux64/releng.manifest
@ -27,20 +26,20 @@ ADD topsrcdir/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh /setup/
 RUN bash /setup/system-setup.sh

 # %include taskcluster/docker/recipes/run-task
-ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
+ADD topsrcdir/taskcluster/docker/recipes/run-task /home/worker/bin/run-task

 # %include taskcluster/scripts/tester/test-linux.sh
-ADD topsrcdir/taskcluster/scripts/tester/test-linux.sh /builds/worker/bin/test-linux.sh
+ADD topsrcdir/taskcluster/scripts/tester/test-linux.sh /home/worker/bin/test-linux.sh

 # This will create a host mounted filesystem when the cache is stripped
 # on Try. This cancels out some of the performance losses of aufs. See
 # bug 1291940.
-VOLUME /builds/worker/checkouts
-VOLUME /builds/worker/workspace
+VOLUME /home/worker/checkouts
+VOLUME /home/worker/workspace

 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
-ENV           HOME          /builds/worker
+ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
@ -49,16 +48,16 @@ ENV           LANG          en_US.UTF-8
 ENV           LC_ALL        en_US.UTF-8

 # Add utilities and configuration
-COPY           dot-files/config              /builds/worker/.config
-COPY           dot-files/pulse               /builds/worker/.pulse
+COPY           dot-files/config              /home/worker/.config
+COPY           dot-files/pulse               /home/worker/.pulse
 RUN            chmod +x bin/*
 # TODO: remove this when buildbot is gone
-COPY           buildprops.json               /builds/worker/buildprops.json
+COPY           buildprops.json               /home/worker/buildprops.json
 COPY           tc-vcs-config.yml /etc/taskcluster-vcs.yml

 # TODO: remove
-ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /builds/worker/bin/buildbot_step
-RUN chmod u+x /builds/worker/bin/buildbot_step
+ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
+RUN chmod u+x /home/worker/bin/buildbot_step

 # allow the worker user to access video devices
 RUN usermod -a -G video worker
@ -69,7 +68,7 @@ RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
 RUN npm install -g taskcluster-vcs@2.3.12 \
 && npm install -g taskcluster-npm-cache@1.1.14 \
 && rm -rf ~/.npm
-ENV PATH $PATH:/builds/worker/bin
+ENV PATH $PATH:/home/worker/bin

 # TODO Re-enable worker when bug 1093833 lands
 #USER          worker
@ -96,14 +95,14 @@ ENV DISPLAY :0
 ADD apport /etc/default/apport

 # Disable font antialiasing for now to match releng's setup
-ADD fonts.conf /builds/worker/.fonts.conf
+ADD fonts.conf /home/worker/.fonts.conf

 # Set up first-run experience for interactive mode
 ADD motd /etc/taskcluster-motd
 ADD taskcluster-interactive-shell /bin/taskcluster-interactive-shell
 RUN chmod +x /bin/taskcluster-interactive-shell

-RUN chown -R worker:worker /builds/worker
+RUN chown -R worker:worker /home/worker

 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
--- a/taskcluster/docker/desktop1604-test/Dockerfile
+++ b/taskcluster/docker/desktop1604-test/Dockerfile
@ -1,9 +1,8 @@
 FROM          ubuntu:16.04
 MAINTAINER    Joel Maher <joel.maher@gmail.com>

-RUN mkdir /builds
-RUN useradd -d /builds/worker -s /bin/bash -m worker
-WORKDIR /builds/worker
+RUN useradd -d /home/worker -s /bin/bash -m worker
+WORKDIR /home/worker

 # %include python/mozbuild/mozbuild/action/tooltool.py
 ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /setup/tooltool.py
@ -30,23 +29,23 @@ RUN           bash /setup/system-setup.sh

 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
-ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
+ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /home/worker/scripts/xvfb.sh

 # %include taskcluster/docker/recipes/run-task
-ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
+ADD topsrcdir/taskcluster/docker/recipes/run-task /home/worker/bin/run-task

 # %include taskcluster/scripts/tester/test-linux.sh
-ADD topsrcdir/taskcluster/scripts/tester/test-linux.sh /builds/worker/bin/test-linux.sh
+ADD topsrcdir/taskcluster/scripts/tester/test-linux.sh /home/worker/bin/test-linux.sh

 # This will create a host mounted filesystem when the cache is stripped
 # on Try. This cancels out some of the performance losses of aufs. See
 # bug 1291940.
-VOLUME /builds/worker/checkouts
-VOLUME /builds/worker/workspace
+VOLUME /home/worker/checkouts
+VOLUME /home/worker/workspace

 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
-ENV           HOME          /builds/worker
+ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
@ -55,16 +54,16 @@ ENV           LANG          en_US.UTF-8
 ENV           LC_ALL        en_US.UTF-8

 # Add utilities and configuration
-COPY           dot-files/config              /builds/worker/.config
-COPY           dot-files/pulse               /builds/worker/.pulse
+COPY           dot-files/config              /home/worker/.config
+COPY           dot-files/pulse               /home/worker/.pulse
 RUN            chmod +x bin/*
 # TODO: remove this when buildbot is gone
-COPY           buildprops.json               /builds/worker/buildprops.json
+COPY           buildprops.json               /home/worker/buildprops.json
 COPY           tc-vcs-config.yml /etc/taskcluster-vcs.yml

 # TODO: remove
-ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /builds/worker/bin/buildbot_step
-RUN chmod u+x /builds/worker/bin/buildbot_step
+ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
+RUN chmod u+x /home/worker/bin/buildbot_step

 # allow the worker user to access video devices
 RUN usermod -a -G video worker
@ -75,7 +74,7 @@ RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
 RUN npm install -g taskcluster-vcs@2.3.12 \
 && npm install -g taskcluster-npm-cache@1.1.14 \
 && rm -rf ~/.npm
-ENV PATH $PATH:/builds/worker/bin
+ENV PATH $PATH:/home/worker/bin

 # TODO Re-enable worker when bug 1093833 lands
 #USER          worker
@ -105,14 +104,14 @@ ENV DISPLAY :0
 ADD apport /etc/default/apport

 # Disable font antialiasing for now to match releng's setup
-ADD fonts.conf /builds/worker/.fonts.conf
+ADD fonts.conf /home/worker/.fonts.conf

 # Set up first-run experience for interactive mode
 ADD motd /etc/taskcluster-motd
 ADD taskcluster-interactive-shell /bin/taskcluster-interactive-shell
 RUN chmod +x /bin/taskcluster-interactive-shell

-RUN chown -R worker:worker /builds/worker
+RUN chown -R worker:worker /home/worker

 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
--- a/taskcluster/docker/lint/Dockerfile
+++ b/taskcluster/docker/lint/Dockerfile
@ -1,10 +1,10 @@
 FROM          ubuntu:16.04
 MAINTAINER    Andrew Halberstadt <ahalberstadt@mozilla.com>

-RUN mkdir /builds
-RUN useradd -d /builds/worker -s /bin/bash -m worker
-WORKDIR /builds/worker
+RUN useradd -d /home/worker -s /bin/bash -m worker
+WORKDIR /home/worker

+RUN mkdir /build
 # %include python/mozbuild/mozbuild/action/tooltool.py
 ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /build/tooltool.py

@ -24,12 +24,12 @@ ADD topsrcdir/tools/lint/tox/tox_requirements.txt /tmp/tox_requirements.txt
 RUN bash /tmp/system-setup.sh

 # %include taskcluster/docker/recipes/run-task
-ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
-RUN chown -R worker:worker /builds/worker/bin && chmod 755 /builds/worker/bin/*
+ADD topsrcdir/taskcluster/docker/recipes/run-task /home/worker/bin/run-task
+RUN chown -R worker:worker /home/worker/bin && chmod 755 /home/worker/bin/*

 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
-ENV           HOME          /builds/worker
+ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
--- a/taskcluster/scripts/builder/build-l10n.sh
+++ b/taskcluster/scripts/builder/build-l10n.sh
@ -4,7 +4,7 @@ set -x -e

 echo "running as" $(id)

-. /builds/worker/scripts/xvfb.sh
+. /home/worker/scripts/xvfb.sh

 ####
 # Taskcluster friendly wrapper for performing fx desktop l10n repacks via mozharness.
@ -18,11 +18,11 @@ echo "running as" $(id)
 : MOZHARNESS_ACTIONS            ${MOZHARNESS_ACTIONS}
 : MOZHARNESS_OPTIONS            ${MOZHARNESS_OPTIONS}

-: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}

 : NEED_XVFB                     ${NEED_XVFB:=false}

-: WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
+: WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}

 set -v

@ -86,7 +86,7 @@ if [ -n "$MOZHARNESS_OPTIONS" ]; then
    done
 fi

-cd /builds/worker
+cd /home/worker

 python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
  --disable-mock \
--- a/taskcluster/scripts/builder/build-linux.sh
+++ b/taskcluster/scripts/builder/build-linux.sh
@ -4,7 +4,7 @@ set -x -e

 echo "running as" $(id)

-. /builds/worker/scripts/xvfb.sh
+. /home/worker/scripts/xvfb.sh

 ####
 # Taskcluster friendly wrapper for performing fx desktop builds via mozharness.
@ -17,7 +17,7 @@ echo "running as" $(id)
 : MOZHARNESS_ACTIONS            ${MOZHARNESS_ACTIONS}
 : MOZHARNESS_OPTIONS            ${MOZHARNESS_OPTIONS}

-: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}

 : NEED_XVFB                     ${NEED_XVFB:=false}

@ -26,7 +26,7 @@ echo "running as" $(id)
 : MH_BUILD_POOL                 ${MH_BUILD_POOL:=staging}
 : MOZ_SCM_LEVEL                 ${MOZ_SCM_LEVEL:=1}

-: WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
+: WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}

 set -v

@ -112,7 +112,7 @@ if [ -n "$MOZHARNESS_OPTIONS" ]; then
    done
 fi

-cd /builds/worker
+cd /home/worker

 python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} ${config_cmds} \
  $debug_flag \
--- a/taskcluster/scripts/builder/repackage.sh
+++ b/taskcluster/scripts/builder/repackage.sh
@ -4,7 +4,7 @@ set -x -e

 echo "running as" $(id)

-. /builds/worker/scripts/xvfb.sh
+. /home/worker/scripts/xvfb.sh

 ####
 # Taskcluster friendly wrapper for performing fx desktop builds via mozharness.
@ -17,9 +17,9 @@ echo "running as" $(id)
 : MOZHARNESS_ACTIONS            ${MOZHARNESS_ACTIONS}
 : MOZHARNESS_OPTIONS            ${MOZHARNESS_OPTIONS}

-: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}

-: WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
+: WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}

 set -v

@ -84,7 +84,7 @@ if [ -n "$MOZHARNESS_OPTIONS" ]; then
    done
 fi

-cd /builds/worker
+cd /home/worker

 python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} ${config_cmds} \
  $actions \
--- a/taskcluster/scripts/misc/build-clang-windows-helper32.sh
+++ b/taskcluster/scripts/misc/build-clang-windows-helper32.sh
@ -4,7 +4,7 @@ set -x -e -v

 # This script is for building clang-cl on Windows.

-: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE

 TOOLTOOL_AUTH_FILE=/c/builds/relengapi.tok
--- a/taskcluster/scripts/misc/build-clang-windows-helper64.sh
+++ b/taskcluster/scripts/misc/build-clang-windows-helper64.sh
@ -4,7 +4,7 @@ set -x -e -v

 # This script is for building clang-cl on Windows.

-: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE

 TOOLTOOL_AUTH_FILE=/c/builds/relengapi.tok
--- a/taskcluster/scripts/misc/tooltool-download.sh
+++ b/taskcluster/scripts/misc/tooltool-download.sh
@ -2,7 +2,7 @@

 cd $HOME/workspace/build/src

-: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
+: TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE

 ./mach artifact toolchain -v --tooltool-url=http://relengapi/tooltool/ --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
--- a/taskcluster/taskgraph/action.yml
+++ b/taskcluster/taskgraph/action.yml
@ -28,10 +28,10 @@ payload:
    GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
    GECKO_HEAD_REF: '{{head_ref}}'
    GECKO_HEAD_REV: '{{head_rev}}'
-    HG_STORE_PATH: /builds/worker/checkouts/hg-store
+    HG_STORE_PATH: /home/worker/checkouts/hg-store

  cache:
-    level-{{level}}-checkouts: /builds/worker/checkouts
+    level-{{level}}-checkouts: /home/worker/checkouts

  features:
    taskclusterProxy: true
@ -47,20 +47,20 @@ payload:
  maxRunTime: 1800

  command:
-    - /builds/worker/bin/run-task
-    - '--vcs-checkout=/builds/worker/checkouts/gecko'
+    - /home/worker/bin/run-task
+    - '--vcs-checkout=/home/worker/checkouts/gecko'
    - '--'
    - bash
    - -cx
    - >
-        cd /builds/worker/checkouts/gecko &&
-        ln -s /builds/worker/artifacts artifacts &&
+        cd /home/worker/checkouts/gecko &&
+        ln -s /home/worker/artifacts artifacts &&
        ./mach --log-no-times taskgraph {{action}} {{action_args}}

  artifacts:
    'public':
      type: 'directory'
-      path: '/builds/worker/artifacts'
+      path: '/home/worker/artifacts'
      expires: '{{#from_now}}7 days{{/from_now}}'

 extra:
--- a/taskcluster/taskgraph/transforms/android_stuff.py
+++ b/taskcluster/taskgraph/transforms/android_stuff.py
@ -32,7 +32,7 @@ def setup_task(config, tasks):
            'type': 'persistent',
            'name': 'level-{}-{}-tc-vcs'.format(
                config.params['level'], config.params['project']),
-            'mount-point': "/builds/worker/.tc-vcs",
+            'mount-point': "/home/worker/.tc-vcs",
        })

        if int(config.params['level']) > 1:
@ -40,7 +40,7 @@ def setup_task(config, tasks):
                'type': 'persistent',
                'name': 'level-{}-{}-build-{}-workspace'.format(
                    config.params['level'], config.params['project'], task['name']),
-                'mount-point': "/builds/worker/workspace",
+                'mount-point': "/home/worker/workspace",
            })

        # Need appropriate scopes for secrets, from the 'build' section
--- a/taskcluster/taskgraph/transforms/job/common.py
+++ b/taskcluster/taskgraph/transforms/job/common.py
@ -28,7 +28,7 @@ def docker_worker_add_workspace_cache(config, job, taskdesc, extra=None):
            taskdesc['attributes']['build_platform'],
            taskdesc['attributes']['build_type'],
        ),
-        'mount-point': "/builds/worker/workspace",
+        'mount-point': "/home/worker/workspace",
    })
    if extra:
        taskdesc['worker']['caches'][-1]['name'] += '-{}'.format(
@ -41,14 +41,14 @@ def docker_worker_add_tc_vcs_cache(config, job, taskdesc):
        'type': 'persistent',
        'name': 'level-{}-{}-tc-vcs'.format(
            config.params['level'], config.params['project']),
-        'mount-point': "/builds/worker/.tc-vcs",
+        'mount-point': "/home/worker/.tc-vcs",
    })


 def docker_worker_add_public_artifacts(config, job, taskdesc):
    taskdesc['worker'].setdefault('artifacts', []).append({
        'name': 'public/build',
-        'path': '/builds/worker/artifacts/',
+        'path': '/home/worker/artifacts/',
        'type': 'directory',
    })

@ -86,7 +86,7 @@ def support_vcs_checkout(config, job, taskdesc):
            # ``v1`` was introduced to provide a clean break from the unversioned
            # cache.
            'name': 'level-%s-checkouts-v1' % level,
-            'mount-point': '/builds/worker/checkouts',
+            'mount-point': '/home/worker/checkouts',
        })

    taskdesc['worker'].setdefault('env', {}).update({
--- a/taskcluster/taskgraph/transforms/job/hazard.py
+++ b/taskcluster/taskgraph/transforms/job/hazard.py
@ -63,23 +63,23 @@ def docker_worker_hazard(config, job, taskdesc):
    worker['caches'].append({
        'type': 'persistent',
        'name': 'tooltool-cache',
-        'mount-point': '/builds/worker/tooltool-cache',
+        'mount-point': '/home/worker/tooltool-cache',
    })
    worker['relengapi-proxy'] = True
    taskdesc['scopes'].extend([
        'docker-worker:relengapi-proxy:tooltool.download.public',
    ])
-    env['TOOLTOOL_CACHE'] = '/builds/worker/tooltool-cache'
+    env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'

    # build-haz-linux.sh needs this otherwise it assumes the checkout is in
    # the workspace.
-    env['GECKO_DIR'] = '/builds/worker/checkouts/gecko'
+    env['GECKO_DIR'] = '/home/worker/checkouts/gecko'

    worker['command'] = [
-        '/builds/worker/bin/run-task',
-        '--chown-recursive', '/builds/worker/tooltool-cache',
-        '--chown-recursive', '/builds/worker/workspace',
-        '--vcs-checkout', '/builds/worker/checkouts/gecko',
+        '/home/worker/bin/run-task',
+        '--chown-recursive', '/home/worker/tooltool-cache',
+        '--chown-recursive', '/home/worker/workspace',
+        '--vcs-checkout', '/home/worker/checkouts/gecko',
        '--',
        '/bin/bash', '-c', run['command']
    ]
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@ -143,7 +143,7 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
        worker['caches'].append({
            'type': 'persistent',
            'name': 'tooltool-cache',
-            'mount-point': '/builds/worker/tooltool-cache',
+            'mount-point': '/home/worker/tooltool-cache',
        })
        taskdesc['scopes'].extend([
            'docker-worker:relengapi-proxy:tooltool.download.public',
@ -151,7 +151,7 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
        if run['tooltool-downloads'] == 'internal':
            taskdesc['scopes'].append(
                'docker-worker:relengapi-proxy:tooltool.download.internal')
-        env['TOOLTOOL_CACHE'] = '/builds/worker/tooltool-cache'
+        env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'

    # Retry if mozharness returns TBPL_RETRY
    worker['retry-exit-status'] = 4
@ -159,15 +159,15 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
    docker_worker_setup_secrets(config, job, taskdesc)

    command = [
-        '/builds/worker/bin/run-task',
+        '/home/worker/bin/run-task',
        # Various caches/volumes are default owned by root:root.
-        '--chown-recursive', '/builds/worker/workspace',
-        '--chown-recursive', '/builds/worker/tooltool-cache',
-        '--vcs-checkout', '/builds/worker/workspace/build/src',
-        '--tools-checkout', '/builds/worker/workspace/build/tools',
+        '--chown-recursive', '/home/worker/workspace',
+        '--chown-recursive', '/home/worker/tooltool-cache',
+        '--vcs-checkout', '/home/worker/workspace/build/src',
+        '--tools-checkout', '/home/worker/workspace/build/tools',
        '--',
    ]
-    command.append("/builds/worker/workspace/build/src/{}".format(
+    command.append("/home/worker/workspace/build/src/{}".format(
        run.get('job-script',
                "taskcluster/scripts/builder/build-linux.sh"
                )))
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@ -64,9 +64,9 @@ def mozharness_test_on_docker(config, job, taskdesc):

    artifacts = [
        # (artifact name prefix, in-image path)
-        ("public/logs/", "/builds/worker/workspace/build/upload/logs/"),
-        ("public/test", "/builds/worker/artifacts/"),
-        ("public/test_info/", "/builds/worker/workspace/build/blobber_upload_dir/"),
+        ("public/logs/", "/home/worker/workspace/build/upload/logs/"),
+        ("public/test", "/home/worker/artifacts/"),
+        ("public/test_info/", "/home/worker/workspace/build/blobber_upload_dir/"),
    ]

    installer_url = get_artifact_url('<build>', mozharness['build-artifact-name'])
@ -75,7 +75,7 @@ def mozharness_test_on_docker(config, job, taskdesc):

    worker['artifacts'] = [{
        'name': prefix,
-        'path': os.path.join('/builds/worker/workspace', path),
+        'path': os.path.join('/home/worker/workspace', path),
        'type': 'directory',
    } for (prefix, path) in artifacts]

@ -83,7 +83,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
        'type': 'persistent',
        'name': 'level-{}-{}-test-workspace'.format(
            config.params['level'], config.params['project']),
-        'mount-point': "/builds/worker/workspace",
+        'mount-point': "/home/worker/workspace",
    }]

    env = worker['env'] = {
@ -115,7 +115,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
        worker['caches'].append({
            'type': 'persistent',
            'name': 'tooltool-cache',
-            'mount-point': '/builds/worker/tooltool-cache',
+            'mount-point': '/home/worker/tooltool-cache',
        })
        taskdesc['scopes'].extend([
            'docker-worker:relengapi-proxy:tooltool.download.internal',
@ -127,9 +127,9 @@ def mozharness_test_on_docker(config, job, taskdesc):

    # assemble the command line
    command = [
-        '/builds/worker/bin/run-task',
+        '/home/worker/bin/run-task',
        # The workspace cache/volume is default owned by root:root.
-        '--chown', '/builds/worker/workspace',
+        '--chown', '/home/worker/workspace',
    ]

    # Support vcs checkouts regardless of whether the task runs from
@ -139,14 +139,14 @@ def mozharness_test_on_docker(config, job, taskdesc):
    # If we have a source checkout, run mozharness from it instead of
    # downloading a zip file with the same content.
    if test['checkout']:
-        command.extend(['--vcs-checkout', '/builds/worker/checkouts/gecko'])
-        env['MOZHARNESS_PATH'] = '/builds/worker/checkouts/gecko/testing/mozharness'
+        command.extend(['--vcs-checkout', '/home/worker/checkouts/gecko'])
+        env['MOZHARNESS_PATH'] = '/home/worker/checkouts/gecko/testing/mozharness'
    else:
        env['MOZHARNESS_URL'] = {'task-reference': mozharness_url}

    command.extend([
        '--',
-        '/builds/worker/bin/test-linux.sh',
+        '/home/worker/bin/test-linux.sh',
    ])

    if mozharness.get('no-read-buildbot-config'):
--- a/taskcluster/taskgraph/transforms/job/run_task.py
+++ b/taskcluster/taskgraph/transforms/job/run_task.py
@ -19,7 +19,7 @@ run_task_schema = Schema({
    # tend to hide their caches.  This cache is never added for level-1 jobs.
    Required('cache-dotcache', default=False): bool,

-    # if true (the default), perform a checkout in /builds/worker/checkouts/gecko
+    # if true (the default), perform a checkout in /home/worker/checkouts/gecko
    Required('checkout', default=True): bool,

    # The command arguments to pass to the `run-task` script, after the
@ -45,13 +45,13 @@ def docker_worker_run_task(config, job, taskdesc):
        worker['caches'].append({
            'type': 'persistent',
            'name': 'level-{level}-{project}-dotcache'.format(**config.params),
-            'mount-point': '/builds/worker/.cache',
+            'mount-point': '/home/worker/.cache',
        })

    run_command = run['command']
    if isinstance(run_command, basestring):
        run_command = ['bash', '-cx', run_command]
-    command = ['/builds/worker/bin/run-task']
+    command = ['/home/worker/bin/run-task']
    if run['checkout']:
        command.append('--vcs-checkout=~/checkouts/gecko')
    command.append('--fetch-hgfingerprint')
--- a/taskcluster/taskgraph/transforms/job/spidermonkey.py
+++ b/taskcluster/taskgraph/transforms/job/spidermonkey.py
@ -40,7 +40,7 @@ def docker_worker_spidermonkey(config, job, taskdesc):
            'type': 'persistent',
            'name': 'level-{}-{}-build-spidermonkey-workspace'.format(
                config.params['level'], config.params['project']),
-            'mount-point': "/builds/worker/workspace",
+            'mount-point': "/home/worker/workspace",
        })

    docker_worker_add_public_artifacts(config, job, taskdesc)
@ -58,9 +58,9 @@ def docker_worker_spidermonkey(config, job, taskdesc):
    worker['caches'].append({
        'type': 'persistent',
        'name': 'tooltool-cache',
-        'mount-point': '/builds/worker/tooltool-cache',
+        'mount-point': '/home/worker/tooltool-cache',
    })
-    env['TOOLTOOL_CACHE'] = '/builds/worker/tooltool-cache'
+    env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'

    support_vcs_checkout(config, job, taskdesc)

@ -71,12 +71,12 @@ def docker_worker_spidermonkey(config, job, taskdesc):
        script = "build-sm-mozjs-crate.sh"

    worker['command'] = [
-        '/builds/worker/bin/run-task',
-        '--chown-recursive', '/builds/worker/workspace',
-        '--chown-recursive', '/builds/worker/tooltool-cache',
-        '--vcs-checkout', '/builds/worker/workspace/build/src',
+        '/home/worker/bin/run-task',
+        '--chown-recursive', '/home/worker/workspace',
+        '--chown-recursive', '/home/worker/tooltool-cache',
+        '--vcs-checkout', '/home/worker/workspace/build/src',
        '--',
        '/bin/bash',
        '-c',
-        'cd /builds/worker && workspace/build/src/taskcluster/scripts/builder/%s' % script
+        'cd /home/worker && workspace/build/src/taskcluster/scripts/builder/%s' % script
    ]
--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@ -79,7 +79,7 @@ def docker_worker_toolchain(config, job, taskdesc):

    worker['artifacts'].append({
        'name': 'public',
-        'path': '/builds/worker/workspace/artifacts/',
+        'path': '/home/worker/workspace/artifacts/',
        'type': 'directory',
    })

@ -101,9 +101,9 @@ def docker_worker_toolchain(config, job, taskdesc):
    worker['caches'].append({
        'type': 'persistent',
        'name': 'tooltool-cache',
-        'mount-point': '/builds/worker/tooltool-cache',
+        'mount-point': '/home/worker/tooltool-cache',
    })
-    env['TOOLTOOL_CACHE'] = '/builds/worker/tooltool-cache'
+    env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'

    # tooltool downloads
    worker['relengapi-proxy'] = False  # but maybe enabled for tooltool below
@ -117,15 +117,15 @@ def docker_worker_toolchain(config, job, taskdesc):
                'docker-worker:relengapi-proxy:tooltool.download.internal')

    worker['command'] = [
-        '/builds/worker/bin/run-task',
+        '/home/worker/bin/run-task',
        # Various caches/volumes are default owned by root:root.
-        '--chown-recursive', '/builds/worker/workspace',
-        '--chown-recursive', '/builds/worker/tooltool-cache',
-        '--vcs-checkout=/builds/worker/workspace/build/src',
+        '--chown-recursive', '/home/worker/workspace',
+        '--chown-recursive', '/home/worker/tooltool-cache',
+        '--vcs-checkout=/home/worker/workspace/build/src',
        '--',
        'bash',
        '-c',
-        'cd /builds/worker && '
+        'cd /home/worker && '
        './workspace/build/src/taskcluster/scripts/misc/{}'.format(
            run['script'])
    ]
--- a/taskcluster/taskgraph/transforms/marionette_harness.py
+++ b/taskcluster/taskgraph/transforms/marionette_harness.py
@ -31,7 +31,7 @@ def setup_task(config, tasks):
            'type': 'persistent',
            'name': 'level-{}-{}-tc-vcs'.format(
                config.params['level'], config.params['project']),
-            'mount-point': "/builds/worker/.tc-vcs",
+            'mount-point': "/home/worker/.tc-vcs",
        }]

        yield task
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@ -139,11 +139,11 @@ def make_job_description(config, jobs):
            mozharness_config = ['repackage/osx_signed.py']
            output_files = [{
                'type': 'file',
-                'path': '/builds/worker/workspace/build/artifacts/target.dmg',
+                'path': '/home/worker/workspace/build/artifacts/target.dmg',
                'name': 'public/build/{}target.dmg'.format(locale_output_path),
            }, {
                'type': 'file',
-                'path': '/builds/worker/workspace/build/artifacts/target.complete.mar',
+                'path': '/home/worker/workspace/build/artifacts/target.complete.mar',
                'name': 'public/build/{}target.complete.mar'.format(locale_output_path),
            }]
        else:
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@ -9,8 +9,8 @@ config = {
    "download_tooltool": True,
    "tooltool_servers": ['http://relengapi/tooltool/'],
    "tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm_4_3/releng.manifest",
-    "tooltool_cache": "/builds/worker/tooltool_cache",
-    "avds_dir": "/builds/worker/workspace/build/.android",
+    "tooltool_cache": "/home/worker/tooltool_cache",
+    "avds_dir": "/home/worker/workspace/build/.android",
    "emulator_manifest": """
        [
        {
--- a/testing/mozharness/configs/android/androidx86.py
+++ b/testing/mozharness/configs/android/androidx86.py
@ -4,10 +4,10 @@ config = {
    "buildbot_json_path": "buildprops.json",
    "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
    "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86/releng.manifest",
-    "tooltool_cache": "/builds/worker/tooltool_cache",
+    "tooltool_cache": "/home/worker/tooltool_cache",
    "download_tooltool": True,
    "tooltool_servers": ['http://relengapi/tooltool/'],
-    "avds_dir": "/builds/worker/workspace/build/.android",
+    "avds_dir": "/home/worker/workspace/build/.android",
    "emulator_manifest": """
        [
        {
--- a/testing/mozharness/configs/builds/build_pool_specifics.py
+++ b/testing/mozharness/configs/builds/build_pool_specifics.py
@ -38,7 +38,7 @@ config = {
        "tooltool_url": 'http://relengapi/tooltool/',
        'upload_env': {
            'UPLOAD_HOST': 'localhost',
-            'UPLOAD_PATH': '/builds/worker/artifacts',
+            'UPLOAD_PATH': '/home/worker/artifacts',
        },
    },
 }
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@ -83,7 +83,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'CCACHE_DIR': '/builds/ccache',
        'CCACHE_COMPRESS': '1',
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@ -79,7 +79,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'MOZ_CRASHREPORTER_NO_REPORT': '1',
        'CCACHE_DIR': '/builds/ccache',
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@ -78,7 +78,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'MOZ_CRASHREPORTER_NO_REPORT': '1',
        'CCACHE_DIR': '/builds/ccache',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@ -49,7 +49,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'MOZ_CRASHREPORTER_NO_REPORT': '1',
        'CCACHE_DIR': '/builds/ccache',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
@ -32,7 +32,7 @@ config = {
        'CCACHE_UMASK': '002',
        'LC_ALL': 'C',
        ## 64 bit specific
-        'PATH': '/builds/worker/workspace/build/src/gcc/bin:/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:\
+        'PATH': '/home/worker/workspace/build/src/gcc/bin:/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
    },
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
@ -49,7 +49,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'MOZ_CRASHREPORTER_NO_REPORT': '1',
        'CCACHE_DIR': '/builds/ccache',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@ -39,7 +39,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'MOZ_CRASHREPORTER_NO_REPORT': '1',
        'CCACHE_DIR': '/builds/ccache',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
@ -39,7 +39,7 @@ config = {
        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
        'MOZ_OBJDIR': 'obj-firefox',
        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
+        'TOOLTOOL_CACHE': '/home/worker/tooltool-cache',
        'TOOLTOOL_HOME': '/builds',
        'MOZ_CRASHREPORTER_NO_REPORT': '1',
        'CCACHE_DIR': '/builds/ccache',
--- a/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
+++ b/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
@ -16,5 +16,5 @@ config = {
    "pip_index": False,

    "download_minidump_stackwalk": True,
-    "tooltool_cache": "/builds/worker/tooltool-cache",
+    "tooltool_cache": "/home/worker/tooltool-cache",
 }
--- a/testing/mozharness/configs/marionette/prod_config.py
+++ b/testing/mozharness/configs/marionette/prod_config.py
@ -37,7 +37,7 @@ config = {
    "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
    "download_symbols": "ondemand",
    "download_minidump_stackwalk": True,
-    "tooltool_cache": "/builds/worker/tooltool-cache",
+    "tooltool_cache": "/home/worker/tooltool-cache",
    "suite_definitions": {
        "marionette_desktop": {
            "options": [
--- a/testing/mozharness/configs/single_locale/tc_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-15.py
@ -11,7 +11,7 @@ config = {

    "upload_env": {
        'UPLOAD_HOST': 'localhost',
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
+        'UPLOAD_PATH': '/home/worker/artifacts/',
    },
    "mozilla_dir": "src/",
    "simple_name_move": True,
--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@ -20,7 +20,7 @@ config = {
    },
    "upload_env": {
        'UPLOAD_HOST': 'localhost',
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
+        'UPLOAD_PATH': '/home/worker/artifacts/',
    },
    "mozilla_dir": "src/",
    "simple_name_move": True,
--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@ -20,7 +20,7 @@ config = {
    },
    "upload_env": {
        'UPLOAD_HOST': 'localhost',
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
+        'UPLOAD_PATH': '/home/worker/artifacts/',
    },
    "mozilla_dir": "src/",
    "simple_name_move": True,
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@ -20,7 +20,7 @@ config = {
    },
    "upload_env": {
        'UPLOAD_HOST': 'localhost',
-        'UPLOAD_PATH': '/builds/worker/artifacts/',
+        'UPLOAD_PATH': '/home/worker/artifacts/',
    },

    "tooltool_url": 'http://relengapi/tooltool/',
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@ -308,7 +308,7 @@ config = {
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
-    "tooltool_cache": "/builds/worker/tooltool-cache",
+    "tooltool_cache": "/home/worker/tooltool-cache",
    "download_nodejs": True,
    "nodejs_path": NODEJS_PATH,
    "nodejs_tooltool_manifest_path": NODEJS_TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py
+++ b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py
@ -82,7 +82,7 @@ class CodeCoverageMixin(object):

        tooltool_path = self._fetch_tooltool_py()
        cmd = [tooltool_path, '--url', 'https://api.pub.build.mozilla.org/tooltool/', 'fetch', \
-            '-m', manifest, '-o', '-c', '/builds/worker/tooltool-cache']
+            '-m', manifest, '-o', '-c', '/home/worker/tooltool-cache']
        self.run_command(cmd, cwd=self.grcov_dir)
        self.run_command(['tar', '-jxvf', os.path.join(self.grcov_dir, 'grcov-linux-standalone-x86_64.tar.bz2'), \
            '-C', self.grcov_dir], cwd=self.grcov_dir)
@ -131,7 +131,7 @@ class CodeCoverageMixin(object):

            # Run grcov on the zipped .gcno and .gcda files.
            grcov_command = [os.path.join(self.grcov_dir, 'grcov'), '-t', 'lcov' , '-p', \
-                             '/builds/worker/workspace/build/src/', '-z', \
+                             '/home/worker/workspace/build/src/', '-z', \
                             os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), file_path_gcda]

            # 'grcov_output' will be a tuple, the first variable is the path to the lcov output,
 @ -1 +1 @@
 .0.2
 .0.1
 @ -1 +1 @@
 .1.7
 .1.6