From 3657c5fa7cce029123945e4b9d527dc300008926 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 14 Apr 2017 17:01:41 +0900 Subject: [PATCH] Bug 1356520 - Set TOOLTOOL_CACHE to /home/worker/tooltool-cache where it makes sense in mozharness. r=mshal The current setup is confusing, and, I guess, an inheritage from when the same mozharness configs were used for buildbot and taskcluster jobs. When mozharness calls tooltool_wrapper.sh, it doesn't set the TOOLTOOL_CACHE environment variable from its configuration, like it does for other commands. Instead, it passes the -c flag with the path from its configuration. Then tooltool_wrapper.sh proceeds with ignoring the -c flag and using TOOLTOOL_CACHE from the original environment, inherited from the taskcluster setup script. The upcoming new wrapper for tooltool in bug 1355731 doesn't keep this confusing behavior, and respects the cache directory it's given on the command line. Now that most jobs run on taskcluster, and few use the same mozharness config between buildbot and taskcluster, we can now go ahead and change the TOOLTOOL_CACHE path in the mozharness config to match reality. The list of files modified was generated from looking at MOZHARNESS_CONFIG values in the full-task-graph.json file coming from the Gecko decision task. --HG-- extra : rebase_source : fe2baee48baffae52f738b4168f862c81370fcef --- .../mozharness/configs/builds/releng_base_android_64_builds.py | 2 +- .../mozharness/configs/builds/releng_base_linux_32_builds.py | 2 +- .../mozharness/configs/builds/releng_base_linux_64_builds.py | 2 +- .../configs/builds/releng_base_mac_64_cross_builds.py | 2 +- .../configs/builds/releng_sub_linux_configs/64_artifact.py | 2 +- .../builds/releng_sub_linux_configs/64_stat_and_debug.py | 2 +- .../configs/builds/releng_sub_linux_configs/64_stat_and_opt.py | 2 +- testing/mozharness/configs/firefox_ui_tests/taskcluster.py | 2 +- testing/mozharness/configs/marionette/prod_config.py | 2 +- testing/mozharness/configs/unittests/linux_unittest.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/mozharness/configs/builds/releng_base_android_64_builds.py b/testing/mozharness/configs/builds/releng_base_android_64_builds.py index 0ffd929c3fb0..db16d269adfc 100644 --- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py @@ -77,7 +77,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'CCACHE_DIR': '/builds/ccache', 'CCACHE_COMPRESS': '1', diff --git a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py index 58712c98b4cf..1bbef56d0b6d 100644 --- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py +++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py @@ -83,7 +83,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'CCACHE_DIR': '/builds/ccache', diff --git a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py index bad0f181cccb..c874dd45bd37 100644 --- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py @@ -82,7 +82,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'CCACHE_DIR': '/builds/ccache', diff --git a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py index f523428528a7..2f912d4861f7 100644 --- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py +++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py @@ -53,7 +53,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'CCACHE_DIR': '/builds/ccache', diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py index 4865ced01a94..4813548499bf 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py @@ -52,7 +52,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'CCACHE_DIR': '/builds/ccache', diff --git 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 index 8e42b6919765..ff8e4c4e6b5b 100644 --- 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 @@ -42,7 +42,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'CCACHE_DIR': '/builds/ccache', diff --git 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 index 10ec4205165d..0a1499db1a54 100644 --- 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 @@ -42,7 +42,7 @@ config = { 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': 'obj-firefox', 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_CACHE': '/home/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'CCACHE_DIR': '/builds/ccache', diff --git a/testing/mozharness/configs/firefox_ui_tests/taskcluster.py b/testing/mozharness/configs/firefox_ui_tests/taskcluster.py index 66fc72935758..e6be6a0cc68e 100644 --- a/testing/mozharness/configs/firefox_ui_tests/taskcluster.py +++ b/testing/mozharness/configs/firefox_ui_tests/taskcluster.py @@ -7,5 +7,5 @@ config = { "pip_index": False, - "tooltool_cache": "/builds/tooltool_cache", + "tooltool_cache": "/home/worker/tooltool-cache", } diff --git a/testing/mozharness/configs/marionette/prod_config.py b/testing/mozharness/configs/marionette/prod_config.py index df83a8626fe9..cf126a488e3c 100644 --- 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/tooltool_cache", + "tooltool_cache": "/home/worker/tooltool-cache", "suite_definitions": { "marionette_desktop": { "options": [ diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index 51c40397374c..43c7d50b892f 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -307,7 +307,7 @@ config = { "download_minidump_stackwalk": True, "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH, "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH, - "tooltool_cache": "/builds/tooltool_cache", + "tooltool_cache": "/home/worker/tooltool-cache", "download_nodejs": True, "nodejs_path": NODEJS_PATH, "nodejs_tooltool_manifest_path": NODEJS_TOOLTOOL_MANIFEST_PATH,