deleted file mode 100644
--- a/browser/config/mozconfigs/linux32/debug-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux32/debug"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/linux32/opt-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux32/nightly"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/debug-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/opt-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx64/debug-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx64/opt-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx64/nightly"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/debug-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win32/debug"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/opt-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/debug-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win64/debug"
-
-ac_add_options --enable-webrender
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/opt-qr
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win64/nightly"
-
-ac_add_options --enable-webrender
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -429,61 +429,8 @@ linux64-add-on-devel/opt:
- builds/releng_base_linux_64_builds.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
custom-build-variant-cfg: add-on-devel
tooltool-downloads: public
need-xvfb: true
run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
-
-linux-qr/opt:
- description: "Linux32 Opt QuantumRender"
- index:
- product: firefox
- job-name: linux-qr-opt
- treeherder:
- platform: linux32-qr/opt
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- implementation: docker-worker
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build generate-build-stats check-test update]
- config:
- - builds/releng_base_linux_32_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- custom-build-variant-cfg: qr-opt
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: [ 'graphics' ]
-
-linux-qr/debug:
- description: "Linux32 Debug QuantumRender"
- index:
- product: firefox
- job-name: linux-qr-debug
- treeherder:
- platform: linux32-qr/debug
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- implementation: docker-worker
- max-run-time: 36000
- coalesce-name: dbg_linux32
- run:
- using: mozharness
- actions: [get-secrets build generate-build-stats check-test update]
- config:
- - builds/releng_base_linux_32_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- custom-build-variant-cfg: qr-debug
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: [ 'graphics' ]--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -39,66 +39,16 @@ macosx64/opt:
actions: [get-secrets build generate-build-stats update]
config:
- builds/releng_base_mac_64_builds.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
tooltool-downloads: internal
-macosx64-qr/debug:
- description: "MacOS X x64 QuantumRender"
- index:
- product: firefox
- job-name: macosx64-qr-debug
- treeherder:
- platform: osx-10-7-qr/debug
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
- worker:
- implementation: docker-worker
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build generate-build-stats update]
- config:
- - builds/releng_base_mac_64_cross_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- custom-build-variant-cfg: cross-qr-debug
- tooltool-downloads: internal
- run-on-projects: [ 'graphics' ]
-
-macosx64-qr/opt:
- description: "MacOS X x64 QuantumRender"
- index:
- product: firefox
- job-name: macosx64-qr-opt
- treeherder:
- platform: osx-10-7-qr/opt
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
- worker:
- implementation: docker-worker
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build generate-build-stats update]
- config:
- - builds/releng_base_mac_64_cross_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- custom-build-variant-cfg: cross-qr-opt
- tooltool-downloads: internal
- run-on-projects: [ 'graphics' ]
-
macosx64-add-on-devel/opt:
description: "MacOS X x64 add-on-devel"
index:
product: firefox
job-name: macosx64-add-on-devel
treeherder:
platform: osx-10-7-add-on-devel/opt
symbol: tc(B)--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -175,96 +175,16 @@ win64-add-on-devel/opt:
run:
using: mozharness
script: "mozharness/scripts/fx_desktop_build.py"
config:
- builds/taskcluster_firefox_windows_64_addondevel.py
- balrog/production.py
run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
-win64-qr/debug:
- description: "Win64 Debug QuantumRender"
- index:
- product: firefox
- job-name: win64-qr-debug
- treeherder:
- platform: windows2012-64-qr/debug
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
- worker:
- implementation: generic-worker
- max-run-time: 7200
- run:
- using: mozharness
- script: mozharness/scripts/fx_desktop_build.py
- config:
- - builds/taskcluster_firefox_win64_qr_debug.py
- run-on-projects: [ 'graphics' ]
-
-win64-qr/opt:
- description: "Win64 Opt QuantumRender"
- index:
- product: firefox
- job-name: win64-qr-opt
- treeherder:
- platform: windows2012-64-qr/opt
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
- worker:
- implementation: generic-worker
- max-run-time: 7200
- run:
- using: mozharness
- script: mozharness/scripts/fx_desktop_build.py
- config:
- - builds/taskcluster_firefox_win64_qr_opt.py
- run-on-projects: [ 'graphics' ]
-
-win32-qr/debug:
- description: "Win32 Debug QuantumRender"
- index:
- product: firefox
- job-name: win32-qr-debug
- treeherder:
- platform: windows2012-32-qr/debug
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
- worker:
- implementation: generic-worker
- max-run-time: 7200
- run:
- using: mozharness
- script: mozharness/scripts/fx_desktop_build.py
- config:
- - builds/taskcluster_firefox_win32_qr_debug.py
- run-on-projects: [ 'graphics' ]
-
-win32-qr/opt:
- description: "Win32 Opt QuantumRender"
- index:
- product: firefox
- job-name: win32-qr-opt
- treeherder:
- platform: windows2012-32-qr/opt
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
- worker:
- implementation: generic-worker
- max-run-time: 7200
- run:
- using: mozharness
- script: mozharness/scripts/fx_desktop_build.py
- config:
- - builds/taskcluster_firefox_win32_qr_opt.py
- run-on-projects: [ 'graphics' ]
-
win64-asan/debug:
description: "Win64 Debug ASAN"
index:
product: firefox
job-name: win64-asan-debug
treeherder:
platform: windows2012-64/asan
symbol: tc(Bd)
@@ -293,9 +213,9 @@ win64-asan/opt:
worker:
implementation: generic-worker
max-run-time: 7200
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_asan_opt.py
- run-on-projects: []
\ No newline at end of file
+ run-on-projects: []--- a/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
+++ b/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
@@ -24,18 +24,16 @@ JOB_NAME_WHITELIST = set([
'android-api-15-old-id-opt',
'android-x86-opt',
'android-x86-old-id-opt',
'browser-haz-debug',
'linux-debug',
'linux-devedition',
'linux-opt',
'linux-pgo',
- 'linux-qr-debug',
- 'linux-qr-opt',
'linux64-add-on-devel',
'linux64-artifact-opt',
'linux64-asan-debug',
'linux64-asan-opt',
'linux64-ccov-opt',
'linux64-clang-tidy',
'linux64-debug',
'linux64-devedition',
@@ -46,18 +44,16 @@ JOB_NAME_WHITELIST = set([
'linux64-st-an-opt',
'linux64-stylo-debug',
'linux64-stylo-opt',
'linux64-valgrind-opt',
'macosx64-add-on-devel',
'macosx64-clang-tidy',
'macosx64-debug',
'macosx64-opt',
- 'macosx64-qr-debug',
- 'macosx64-qr-opt',
'macosx64-st-an-debug',
'macosx64-st-an-opt',
'shell-haz-debug',
'sm-arm-sim-debug',
'sm-arm64-sim-debug',
'sm-asan-opt',
'sm-compacting-debug',
'sm-fuzzing',
@@ -69,29 +65,25 @@ JOB_NAME_WHITELIST = set([
'sm-plaindebug-debug',
'sm-rootanalysis-debug',
'sm-tsan-opt',
'win32-add-on-devel',
'win32-clang-tidy',
'win32-debug',
'win32-opt',
'win32-pgo',
- 'win32-qr-debug',
- 'win32-qr-opt',
'win32-st-an-debug',
'win32-st-an-opt',
'win64-add-on-devel',
'win64-clang-tidy',
'win64-debug',
'win64-opt',
'win64-pgo',
'win64-st-an-debug',
'win64-st-an-opt',
- 'win64-qr-debug',
- 'win64-qr-opt',
'win64-asan-debug',
'win64-asan-opt',
])
JOB_NAME_WHITELIST_ERROR = """\
The gecko-v2 job name {} is not in the whitelist in gecko_v2_whitelist.py.
If this job runs on Buildbot, please ensure that the job names match between
Buildbot and TaskCluster, then add the job name to the whitelist. If this is adeleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_qr_debug.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
- 'default_actions': [
- 'clobber',
- 'clone-tools',
- 'checkout-sources',
- 'setup-mock',
- 'build',
- # 'generate-build-stats',
- 'upload-files',
- 'sendchange',
- 'check-test',
- 'update', # decided by query_is_nightly()
- ],
- 'debug_build': True,
- 'stage_platform': 'linux-debug',
- 'enable_signing': False,
- 'enable_talos_sendchange': False,
- #### 32 bit build specific #####
- 'env': {
- 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
- 'DISPLAY': ':2',
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'MOZ_OBJDIR': MOZ_OBJDIR,
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_COMPRESS': '1',
- 'CCACHE_UMASK': '002',
- 'LC_ALL': 'C',
- # 32 bit specific
- 'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib/ccache:/bin:\
-/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
-/tools/python27-mercurial/bin:/home/cltbld/bin',
- 'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib:\
-%s/dist/bin' % (MOZ_OBJDIR,),
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'TINDERBOX_OUTPUT': '1',
- },
- 'src_mozconfig': 'browser/config/mozconfigs/linux32/debug-qr',
- #######################
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_qr_opt.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/linux32/opt-qr',
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_qr_debug.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
- 'default_actions': [
- 'clobber',
- 'clone-tools',
- 'checkout-sources',
- 'setup-mock',
- 'build',
- # 'generate-build-stats',
- 'upload-files',
- 'sendchange',
- 'check-test',
- 'update', # decided by query_is_nightly()
- ],
- 'stage_platform': 'linux64-debug',
- 'debug_build': True,
- 'enable_signing': False,
- 'enable_talos_sendchange': False,
- #### 64 bit build specific #####
- 'env': {
- 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
- 'DISPLAY': ':2',
- 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
- 'MOZ_OBJDIR': MOZ_OBJDIR,
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_COMPRESS': '1',
- 'CCACHE_UMASK': '002',
- 'LC_ALL': 'C',
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- # 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',
- 'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:\
-%s/dist/bin' % (MOZ_OBJDIR,),
- 'TINDERBOX_OUTPUT': '1',
- },
- 'src_mozconfig': 'browser/config/mozconfigs/linux64/debug-qr',
- #######################
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_qr_opt.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/linux64/opt-qr',
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_qr_debug.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
- 'default_actions': [
- 'clobber',
- 'clone-tools',
- 'checkout-sources',
- # 'setup-mock',
- 'build',
- # 'generate-build-stats',
- 'upload-files',
- 'sendchange',
- 'update', # decided by query_is_nightly()
- ],
- 'stage_platform': 'macosx64-debug',
- 'debug_build': True,
- 'objdir': 'obj-firefox',
- 'enable_talos_sendchange': False,
- #### 64 bit build specific #####
- 'env': {
- 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
- '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',
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- ## 64 bit specific
- 'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
- '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
- ##
- },
- 'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug-qr',
- #######################
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_qr_opt.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/macosx64/opt-qr',
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_debug.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import os
-import sys
-
-config = {
- #########################################################################
- ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
- # if you are updating this with custom 32 bit keys/values please add them
- # below under the '32 bit specific' code block otherwise, update in this
- # code block and also make sure this is synced between:
- # - taskcluster_firefox_win32_debug
- # - taskcluster_firefox_win32_opt
- # - taskcluster_firefox_win64_debug
- # - taskcluster_firefox_win64_opt
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'generate-build-stats',
- 'check-test',
- ],
- 'exes': {
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
- },
- 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
- # decides whether we want to use moz_sign_cmd in env
- 'enable_signing': True,
- 'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
- 'objdir': 'obj-firefox',
- 'tooltool_script': [
- sys.executable,
- os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')
- ],
- 'tooltool_bootstrap': 'setup.sh',
- 'enable_count_ctors': False,
- 'max_build_output_timeout': 60 * 80,
- #########################################################################
-
-
- #########################################################################
- ###### 32 bit specific ######
- 'base_name': 'WINNT_5.2_%(branch)s',
- 'platform': 'win32',
- 'stage_platform': 'win32-debug',
- 'debug_build': True,
- 'publish_nightly_en_US_routes': True,
- 'env': {
- 'BINSCOPE': os.path.join(
- os.environ['ProgramFiles(x86)'], 'Microsoft', 'SDL BinScope', 'BinScope.exe'
- ),
- 'HG_SHARE_BASE_DIR': os.path.join('y:', os.sep, 'hg-shared'),
- 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'MOZ_OBJDIR': 'obj-firefox',
- 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x86/srcsrv/pdbstr.exe',
- 'TINDERBOX_OUTPUT': '1',
- 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/c/builds',
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'MSYSTEM': 'MINGW32',
- },
- 'upload_env': {
- 'UPLOAD_HOST': 'localhost',
- 'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
- },
- "check_test_env": {
- 'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
- 'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
- },
- 'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\debug-qr',
- 'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\releng.manifest',
- #########################################################################
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_opt.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import os
-import sys
-
-config = {
- #########################################################################
- ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
- # if you are updating this with custom 32 bit keys/values please add them
- # below under the '32 bit specific' code block otherwise, update in this
- # code block and also make sure this is synced between:
- # - taskcluster_firefox_win32_debug
- # - taskcluster_firefox_win32_opt
- # - taskcluster_firefox_win64_debug
- # - taskcluster_firefox_win64_opt
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'generate-build-stats',
- 'check-test',
- ],
- 'exes': {
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
- },
- 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
- # decides whether we want to use moz_sign_cmd in env
- 'enable_signing': True,
- 'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
- 'objdir': 'obj-firefox',
- 'tooltool_script': [
- sys.executable,
- os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')
- ],
- 'tooltool_bootstrap': 'setup.sh',
- 'enable_count_ctors': False,
- 'max_build_output_timeout': 60 * 80,
- #########################################################################
-
-
- #########################################################################
- ###### 32 bit specific ######
- 'base_name': 'WINNT_5.2_%(branch)s',
- 'platform': 'win32',
- 'stage_platform': 'win32',
- 'publish_nightly_en_US_routes': True,
- 'env': {
- 'BINSCOPE': os.path.join(
- os.environ['ProgramFiles(x86)'], 'Microsoft', 'SDL BinScope', 'BinScope.exe'
- ),
- 'HG_SHARE_BASE_DIR': os.path.join('y:', os.sep, 'hg-shared'),
- 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'MOZ_OBJDIR': 'obj-firefox',
- 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x86/srcsrv/pdbstr.exe',
- 'TINDERBOX_OUTPUT': '1',
- 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/c/builds',
- 'MSYSTEM': 'MINGW32',
- },
- 'upload_env': {
- 'UPLOAD_HOST': 'localhost',
- 'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
- },
- "check_test_env": {
- 'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
- 'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
- },
- 'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\opt-qr',
- 'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\releng.manifest',
- #########################################################################
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_qr_debug.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import os
-import sys
-
-config = {
- #########################################################################
- ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
- # if you are updating this with custom 64 bit keys/values please add them
- # below under the '64 bit specific' code block otherwise, update in this
- # code block and also make sure this is synced between:
- # - taskcluster_firefox_win32_debug
- # - taskcluster_firefox_win32_opt
- # - taskcluster_firefox_win64_debug
- # - taskcluster_firefox_win64_opt
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- 'exes': {
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
- },
- 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
- # decides whether we want to use moz_sign_cmd in env
- 'enable_signing': True,
- 'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
- 'objdir': 'obj-firefox',
- 'tooltool_script': [
- sys.executable,
- os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')
- ],
- 'tooltool_bootstrap': 'setup.sh',
- 'enable_count_ctors': False,
- 'max_build_output_timeout': 60 * 80,
- #########################################################################
-
-
- #########################################################################
- ###### 64 bit specific ######
- 'base_name': 'WINNT_6.1_x86-64_%(branch)s',
- 'platform': 'win64',
- 'stage_platform': 'win64-debug',
- 'debug_build': True,
- 'publish_nightly_en_US_routes': True,
- 'env': {
- 'HG_SHARE_BASE_DIR': os.path.join('y:', os.sep, 'hg-shared'),
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'MOZ_OBJDIR': 'obj-firefox',
- 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x64/srcsrv/pdbstr.exe',
- 'TINDERBOX_OUTPUT': '1',
- 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/c/builds',
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'MSYSTEM': 'MINGW32',
- },
- 'upload_env': {
- 'UPLOAD_HOST': 'localhost',
- 'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
- },
- "check_test_env": {
- 'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
- 'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
- },
- 'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\debug-qr',
- 'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\releng.manifest',
- #########################################################################
-}deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_qr_opt.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import os
-import sys
-
-config = {
- #########################################################################
- ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
- # if you are updating this with custom 64 bit keys/values please add them
- # below under the '64 bit specific' code block otherwise, update in this
- # code block and also make sure this is synced between:
- # - taskcluster_firefox_win32_debug
- # - taskcluster_firefox_win32_opt
- # - taskcluster_firefox_win64_debug
- # - taskcluster_firefox_win64_opt
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- 'exes': {
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
- },
- 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
- # decides whether we want to use moz_sign_cmd in env
- 'enable_signing': True,
- 'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
- 'objdir': 'obj-firefox',
- 'tooltool_script': [
- sys.executable,
- os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')
- ],
- 'tooltool_bootstrap': 'setup.sh',
- 'enable_count_ctors': False,
- 'max_build_output_timeout': 60 * 80,
- #########################################################################
-
-
- #########################################################################
- ###### 64 bit specific ######
- 'base_name': 'WINNT_6.1_x86-64_%(branch)s',
- 'platform': 'win64',
- 'stage_platform': 'win64',
- 'publish_nightly_en_US_routes': True,
- 'env': {
- 'HG_SHARE_BASE_DIR': os.path.join('y:', os.sep, 'hg-shared'),
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'MOZ_OBJDIR': 'obj-firefox',
- 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x64/srcsrv/pdbstr.exe',
- 'TINDERBOX_OUTPUT': '1',
- 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
- 'TOOLTOOL_HOME': '/c/builds',
- 'MSYSTEM': 'MINGW32',
- },
- 'upload_env': {
- 'UPLOAD_HOST': 'localhost',
- 'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
- },
- "check_test_env": {
- 'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
- 'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
- },
- 'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\opt-qr',
- 'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\releng.manifest',
- #########################################################################
-}--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -347,18 +347,16 @@ class BuildOptionParser(object):
'asan': 'builds/releng_sub_%s_configs/%s_asan.py',
'asan-tc': 'builds/releng_sub_%s_configs/%s_asan_tc.py',
'tsan': 'builds/releng_sub_%s_configs/%s_tsan.py',
'cross-debug': 'builds/releng_sub_%s_configs/%s_cross_debug.py',
'cross-debug-st-an': 'builds/releng_sub_%s_configs/%s_cross_debug_st_an.py',
'cross-debug-artifact': 'builds/releng_sub_%s_configs/%s_cross_debug_artifact.py',
'cross-opt-st-an': 'builds/releng_sub_%s_configs/%s_cross_opt_st_an.py',
'cross-artifact': 'builds/releng_sub_%s_configs/%s_cross_artifact.py',
- 'cross-qr-debug': 'builds/releng_sub_%s_configs/%s_cross_qr_debug.py',
- 'cross-qr-opt': 'builds/releng_sub_%s_configs/%s_cross_qr_opt.py',
'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py',
'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
'source': 'builds/releng_sub_%s_configs/%s_source.py',
'stylo': 'builds/releng_sub_%s_configs/%s_stylo.py',
'stylo-debug': 'builds/releng_sub_%s_configs/%s_stylo_debug.py',
@@ -377,18 +375,16 @@ class BuildOptionParser(object):
'aarch64': 'builds/releng_sub_%s_configs/%s_aarch64.py',
'android-test': 'builds/releng_sub_%s_configs/%s_test.py',
'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
'android-lint': 'builds/releng_sub_%s_configs/%s_lint.py',
'android-findbugs': 'builds/releng_sub_%s_configs/%s_findbugs.py',
'valgrind' : 'builds/releng_sub_%s_configs/%s_valgrind.py',
'artifact': 'builds/releng_sub_%s_configs/%s_artifact.py',
'debug-artifact': 'builds/releng_sub_%s_configs/%s_debug_artifact.py',
- 'qr-debug': 'builds/releng_sub_%s_configs/%s_qr_debug.py',
- 'qr-opt': 'builds/releng_sub_%s_configs/%s_qr_opt.py',
'devedition': 'builds/releng_sub_%s_configs/%s_devedition.py',
}
build_pool_cfg_file = 'builds/build_pool_specifics.py'
branch_cfg_file = 'builds/branch_specifics.py'
@classmethod
def _query_pltfrm_and_bits(cls, target_option, options):
""" determine platform and bits