--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -119,20 +119,22 @@ win64/debug:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_debug.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/debug.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64/opt:
description: "Win64 Opt"
index:
@@ -144,20 +146,22 @@ win64/opt:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/opt.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64-dmd/opt:
description: "Win64 DMD Opt"
index:
@@ -169,20 +173,22 @@ win64-dmd/opt:
tier: 2
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/opt.py
custom-build-variant-cfg: dmd
run-on-projects: []
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win32-nightly/opt:
@@ -233,20 +239,22 @@ win64-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
actions: [clone-tools, build, check-test, update]
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/opt.py
- disable_signing.py
- taskcluster_nightly.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64/pgo:
@@ -260,21 +268,22 @@ win64/pgo:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
- options: [enable-pgo]
+ options: [enable-pgo, append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/opt.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win32-add-on-devel/opt:
description: "Windows32 add-on-devel"
index:
@@ -315,20 +324,22 @@ win64-add-on-devel/opt:
tier: 2
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: "mozharness/scripts/fx_desktop_build.py"
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_addondevel.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/addondevel.py
- balrog/production.py
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64-noopt/debug:
@@ -342,20 +353,22 @@ win64-noopt/debug:
tier: 2
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_noopt_debug.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/noopt_debug.py
run-on-projects: ['trunk', 'try']
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win32-noopt/debug:
description: "Win32 No-optimize Debug"
@@ -424,20 +437,22 @@ win64-rusttests/opt:
tier: 2
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_rusttests_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/rusttests_opt.py
run-on-projects: ['trunk', 'try']
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64-ccov/debug:
description: "Win64 Debug Code Coverage"
@@ -450,20 +465,22 @@ win64-ccov/debug:
tier: 3
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 14400
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_ccov_debug.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/ccov_debug.py
run-on-projects: []
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64-asan/debug:
description: "Win64 Debug ASAN"
@@ -477,20 +494,22 @@ win64-asan/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
PERFHERDER_EXTRA_OPTIONS: "debug asan"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_asan_debug.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/asan_debug.py
run-on-projects: []
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64-asan/opt:
description: "Win64 Opt ASAN"
@@ -504,20 +523,22 @@ win64-asan/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
PERFHERDER_EXTRA_OPTIONS: "opt asan"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_asan_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/asan_opt.py
run-on-projects: []
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win32-devedition-nightly/opt:
description: "Win32 Dev Edition Nightly"
@@ -567,20 +588,22 @@ win64-devedition-nightly/opt:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_windows_64_opt.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/opt.py
- disable_signing.py
- taskcluster_nightly.py
custom-build-variant-cfg: devedition
run-on-projects: ['mozilla-beta']
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@@ -141,20 +141,22 @@ jobs:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_clang_debug.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/clang_debug.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
win64-st-an/opt:
description: "Win64 Static Analysis Opt (clang-cl)"
index:
@@ -166,16 +168,18 @@ jobs:
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
+ options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/releng_base_firefox.py
- - builds/taskcluster_firefox_win64_clang.py
+ - builds/taskcluster_base_win64.py
+ - builds/taskcluster_sub_win64/clang.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_base_win64.py
@@ -0,0 +1,46 @@
+import os
+import sys
+
+config = {
+ 'default_actions': [
+ 'clone-tools',
+ 'build',
+ 'check-test',
+ ],
+ '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'),
+ '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',
+ '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': '%(abs_obj_dir)s',
+ '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': os.path.join(os.getcwd(), 'public', 'build'),
+ },
+ 'mozconfig_platform': 'win64',
+}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py
+++ /dev/null
@@ -1,67 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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-asan-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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'debug-asan',
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py
+++ /dev/null
@@ -1,65 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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-asan',
- '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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'nightly-asan',
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_ccov_debug.py
+++ /dev/null
@@ -1,76 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- 'exes': {
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'third_party', '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'),
- '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-ccov',
- '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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'code-coverage',
- 'artifact_flag_build_variant_in_try': None,
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
+++ /dev/null
@@ -1,67 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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,
- 'perfherder_extra_options': ['static-analysis'],
- #########################################################################
-
-
- #########################################################################
- ###### 64 bit specific ######
- 'base_name': 'WINNT_6.1_x86-64_%(branch)s',
- 'platform': 'win64',
- 'stage_platform': 'win64-st-an',
- '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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'clang',
- 'artifact_flag_build_variant_in_try': None,
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
+++ /dev/null
@@ -1,69 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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,
- 'perfherder_extra_options': ['static-analysis'],
- #########################################################################
-
-
- #########################################################################
- ###### 64 bit specific ######
- 'base_name': 'WINNT_6.1_x86-64_%(branch)s',
- 'platform': 'win64',
- 'stage_platform': 'win64-st-an-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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'clang-debug',
- 'artifact_flag_build_variant_in_try': None,
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py
+++ /dev/null
@@ -1,68 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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-noopt-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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'noopt-debug',
- 'artifact_flag_build_variant_in_try': None,
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_rusttests_opt.py
+++ /dev/null
@@ -1,67 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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-rusttests',
- '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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'rusttests',
- 'artifact_flag_build_variant_in_try': None,
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py
+++ /dev/null
@@ -1,66 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
- # - taskcluster_firefox_win64_addonsdevel
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
- # decides whether we want to use moz_sign_cmd in env
- 'enable_signing': False,
- 'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
- '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 add-on-devel %(branch)s',
- 'platform': 'win64',
- 'stage_platform': 'win64-add-on-devel',
- 'publish_nightly_en_US_routes': False,
- 'env': {
- 'HG_SHARE_BASE_DIR': os.path.join('y:', os.sep, 'hg-shared'),
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'MOZ_OBJDIR': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': '64',
- 'mozconfig_variant': 'add-on-devel',
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py
+++ /dev/null
@@ -1,67 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- ],
- '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'),
- '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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'debug',
- #########################################################################
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
+++ /dev/null
@@ -1,66 +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
- # - taskcluster_firefox_win32_clang
- # - taskcluster_firefox_win32_clang_debug
- # - taskcluster_firefox_win64_clang
- # - taskcluster_firefox_win64_clang_debug
-
- 'default_actions': [
- 'clone-tools',
- 'build',
- 'check-test',
- 'update',
- ],
- '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'),
- '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': '%(abs_obj_dir)s',
- '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': os.path.join(os.getcwd(), 'public', 'build'),
- },
- 'mozconfig_platform': 'win64',
- 'mozconfig_variant': 'nightly',
- #########################################################################
-}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py
@@ -0,0 +1,7 @@
+config = {
+ 'enable_signing': False,
+ 'base_name': 'WINNT 6.1 x86-64 add-on-devel %(branch)s',
+ 'stage_platform': 'win64-add-on-devel',
+ 'publish_nightly_en_US_routes': False,
+ 'mozconfig_variant': 'add-on-devel',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py
@@ -0,0 +1,8 @@
+config = {
+ 'stage_platform': 'win64-asan-debug',
+ 'debug_build': True,
+ 'env': {
+ 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+ },
+ 'mozconfig_variant': 'debug-asan',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py
@@ -0,0 +1,4 @@
+config = {
+ 'stage_platform': 'win64-asan',
+ 'mozconfig_variant': 'nightly-asan',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py
@@ -0,0 +1,9 @@
+config = {
+ 'stage_platform': 'win64-ccov',
+ 'debug_build': True,
+ 'env': {
+ 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+ },
+ 'mozconfig_variant': 'code-coverage',
+ 'artifact_flag_build_variant_in_try': None,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/clang.py
@@ -0,0 +1,6 @@
+config = {
+ 'perfherder_extra_options': ['static-analysis'],
+ 'stage_platform': 'win64-st-an',
+ 'mozconfig_variant': 'clang',
+ 'artifact_flag_build_variant_in_try': None,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/clang_debug.py
@@ -0,0 +1,10 @@
+config = {
+ 'perfherder_extra_options': ['static-analysis'],
+ 'stage_platform': 'win64-st-an-debug',
+ 'debug_build': True,
+ 'env': {
+ 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+ },
+ 'mozconfig_variant': 'clang-debug',
+ 'artifact_flag_build_variant_in_try': None,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py
@@ -0,0 +1,8 @@
+config = {
+ 'stage_platform': 'win64-debug',
+ 'debug_build': True,
+ 'env': {
+ 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+ },
+ 'mozconfig_variant': 'debug',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
@@ -0,0 +1,9 @@
+config = {
+ 'stage_platform': 'win64-noopt-debug',
+ 'debug_build': True,
+ 'env': {
+ 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+ },
+ 'mozconfig_variant': 'noopt-debug',
+ 'artifact_flag_build_variant_in_try': None,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py
@@ -0,0 +1,10 @@
+config = {
+ 'default_actions': [
+ 'clone-tools',
+ 'build',
+ 'check-test',
+ 'update',
+ ],
+ 'stage_platform': 'win64',
+ 'mozconfig_variant': 'nightly',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
@@ -0,0 +1,8 @@
+config = {
+ 'stage_platform': 'win64-rusttests',
+ 'env': {
+ 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
+ },
+ 'mozconfig_variant': 'rusttests',
+ 'artifact_flag_build_variant_in_try': None,
+}