From 5f81c84a69b50ff0ef93eb25f136b560e8470912 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Mon, 21 Nov 2016 12:29:23 -0500 Subject: [PATCH] Bug 1317758 - Remove in-tree references to the linux64-cc and linux64-tsan jobs. r=Callek --HG-- extra : rebase_source : 43446764b782c775f0bea942634c20c85d567aaf --- .../configs/builds/branch_specifics.py | 30 ------------ .../releng_sub_linux_configs/64_tsan.py | 46 ------------------- 2 files changed, 76 deletions(-) delete mode 100644 testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan.py diff --git a/testing/mozharness/configs/builds/branch_specifics.py b/testing/mozharness/configs/builds/branch_specifics.py index fb75079a0611..e3a7f95224ad 100644 --- a/testing/mozharness/configs/builds/branch_specifics.py +++ b/testing/mozharness/configs/builds/branch_specifics.py @@ -75,18 +75,12 @@ config = { 'linux64-asan': { 'update_channel': 'default', }, - 'linux64-cc': { - 'update_channel': 'default', - }, 'linux64-st-an-debug': { 'update_channel': 'default', }, 'linux64-st-an': { 'update_channel': 'default', }, - 'linux64-tsan': { - 'update_channel': 'default', - }, 'linux64-add-on-devel': { 'update_channel': 'default', }, @@ -155,18 +149,12 @@ config = { 'linux64-asan': { 'update_channel': 'default', }, - 'linux64-cc': { - 'update_channel': 'default', - }, 'linux64-st-an-debug': { 'update_channel': 'default', }, 'linux64-st-an': { 'update_channel': 'default', }, - 'linux64-tsan': { - 'update_channel': 'default', - }, 'linux64-add-on-devel': { 'update_channel': 'default', }, @@ -236,18 +224,12 @@ config = { 'linux64-asan': { 'update_channel': 'default', }, - 'linux64-cc': { - 'update_channel': 'default', - }, 'linux64-st-an-debug': { 'update_channel': 'default', }, 'linux64-st-an': { 'update_channel': 'default', }, - 'linux64-tsan': { - 'update_channel': 'default', - }, 'macosx64-debug': { 'update_channel': 'default', }, @@ -331,18 +313,12 @@ config = { 'linux64-asan': { 'update_channel': 'default', }, - 'linux64-cc': { - 'update_channel': 'default', - }, 'linux64-st-an-debug': { 'update_channel': 'default', }, 'linux64-st-an': { 'update_channel': 'default', }, - 'linux64-tsan': { - 'update_channel': 'default', - }, 'macosx64': { 'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/beta', }, @@ -420,18 +396,12 @@ config = { 'linux64-asan': { 'update_channel': 'default', }, - 'linux64-cc': { - 'update_channel': 'default', - }, 'linux64-st-an-debug': { 'update_channel': 'default', }, 'linux64-st-an': { 'update_channel': 'default', }, - 'linux64-tsan': { - 'update_channel': 'default', - }, 'macosx64': { 'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/release', }, diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan.py deleted file mode 100644 index ae8ed6278bed..000000000000 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan.py +++ /dev/null @@ -1,46 +0,0 @@ -import os - -MOZ_OBJDIR = 'obj-firefox' - -config = { - 'default_actions': [ - 'clobber', - 'clone-tools', - 'checkout-sources', - 'setup-mock', - 'build', - 'upload-files', - 'sendchange', - # 'check-test', - # 'generate-build-stats', - # 'update', - ], - 'stage_platform': 'linux64-tsan', - 'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\ -tsan.manifest", - 'platform_supports_post_upload_to_latest': False, - 'enable_signing': False, - 'enable_talos_sendchange': False, - #### 64 bit build specific ##### - 'env': { - 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), - 'MOZ_AUTOMATION': '1', - 'DISPLAY': ':2', - 'HG_SHARE_BASE_DIR': '/builds/hg-shared', - 'MOZ_OBJDIR': 'obj-firefox', - 'TINDERBOX_OUTPUT': '1', - 'TOOLTOOL_CACHE': '/builds/tooltool_cache', - 'TOOLTOOL_HOME': '/builds', - 'MOZ_CRASHREPORTER_NO_REPORT': '1', - 'CCACHE_DIR': '/builds/ccache', - 'CCACHE_COMPRESS': '1', - 'CCACHE_UMASK': '002', - 'LC_ALL': 'C', - ## 64 bit specific - 'PATH': '/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', - }, - 'src_mozconfig': 'browser/config/mozconfigs/linux64/opt-tsan', - ####################### -}