diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index d30d395a936b..b6239ff93ef1 100755 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -14,13 +14,10 @@ win32/debug: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/debug.py + - builds/taskcluster_firefox_windows_32_debug.py toolchains: - win32-clang-cl - win32-rust @@ -42,13 +39,10 @@ win32/opt: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/opt.py + - builds/taskcluster_firefox_windows_32_opt.py toolchains: - win32-clang-cl - win32-rust @@ -70,13 +64,10 @@ win32-dmd/opt: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/opt.py + - builds/taskcluster_firefox_windows_32_opt.py custom-build-variant-cfg: dmd run-on-projects: [] toolchains: @@ -100,13 +91,11 @@ win32/pgo: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" run: using: mozharness - options: [enable-pgo, append-env-variables-from-configs] + options: [enable-pgo] script: mozharness/scripts/fx_desktop_build.py config: - builds/releng_base_firefox.py - - builds/taskcluster_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/opt.py + - builds/taskcluster_firefox_windows_32_opt.py toolchains: - win32-clang-cl - win32-rust @@ -128,13 +117,10 @@ win64/debug: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/debug.py + - builds/taskcluster_firefox_windows_64_debug.py toolchains: - win64-clang-cl - win64-rust @@ -156,13 +142,10 @@ win64/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/opt.py + - builds/taskcluster_firefox_windows_64_opt.py toolchains: - win64-clang-cl - win64-rust @@ -184,13 +167,10 @@ win64-dmd/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/opt.py + - builds/taskcluster_firefox_windows_64_opt.py custom-build-variant-cfg: dmd run-on-projects: [] toolchains: @@ -218,13 +198,10 @@ win32-nightly/opt: 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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/opt.py + - builds/taskcluster_firefox_windows_32_opt.py - disable_signing.py - taskcluster_nightly.py toolchains: @@ -252,13 +229,10 @@ win64-nightly/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/opt.py + - builds/taskcluster_firefox_windows_64_opt.py - disable_signing.py - taskcluster_nightly.py toolchains: @@ -282,13 +256,11 @@ win64/pgo: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest" run: using: mozharness - options: [enable-pgo, append-env-variables-from-configs] + options: [enable-pgo] script: mozharness/scripts/fx_desktop_build.py config: - builds/releng_base_firefox.py - - builds/taskcluster_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/opt.py + - builds/taskcluster_firefox_windows_64_opt.py toolchains: - win64-clang-cl - win64-rust @@ -310,13 +282,10 @@ win32-add-on-devel/opt: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/addondevel.py + - builds/taskcluster_firefox_windows_32_addondevel.py - balrog/production.py run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45'] toolchains: @@ -340,13 +309,10 @@ win64-add-on-devel/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/addondevel.py + - builds/taskcluster_firefox_windows_64_addondevel.py - balrog/production.py run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45'] toolchains: @@ -370,13 +336,10 @@ win64-noopt/debug: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/noopt_debug.py + - builds/taskcluster_firefox_win64_noopt_debug.py run-on-projects: ['trunk', 'try'] toolchains: - win64-clang-cl @@ -399,13 +362,10 @@ win32-noopt/debug: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/noopt_debug.py + - builds/taskcluster_firefox_win32_noopt_debug.py run-on-projects: ['trunk', 'try'] toolchains: - win32-clang-cl @@ -428,13 +388,10 @@ win32-rusttests/opt: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/rusttests_opt.py + - builds/taskcluster_firefox_win32_rusttests_opt.py run-on-projects: ['trunk', 'try'] toolchains: - win32-clang-cl @@ -457,13 +414,10 @@ win64-rusttests/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/rusttests_opt.py + - builds/taskcluster_firefox_win64_rusttests_opt.py run-on-projects: ['trunk', 'try'] toolchains: - win64-clang-cl @@ -486,13 +440,10 @@ win64-ccov/debug: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/ccov_debug.py + - builds/taskcluster_firefox_win64_ccov_debug.py run-on-projects: [] toolchains: - win64-clang-cl @@ -516,13 +467,10 @@ win64-asan/debug: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/asan_debug.py + - builds/taskcluster_firefox_win64_asan_debug.py run-on-projects: [] toolchains: - win64-clang-cl @@ -546,13 +494,10 @@ win64-asan/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/asan_opt.py + - builds/taskcluster_firefox_win64_asan_opt.py run-on-projects: [] toolchains: - win64-clang-cl @@ -579,12 +524,9 @@ win32-devedition-nightly/opt: run: using: mozharness script: mozharness/scripts/fx_desktop_build.py - options: [enable-pgo, append-env-variables-from-configs] config: - builds/releng_base_firefox.py - - builds/taskcluster_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/opt.py + - builds/taskcluster_firefox_windows_32_opt.py - disable_signing.py - taskcluster_nightly.py custom-build-variant-cfg: devedition @@ -613,13 +555,10 @@ win64-devedition-nightly/opt: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/opt.py + - builds/taskcluster_firefox_windows_64_opt.py - disable_signing.py - taskcluster_nightly.py custom-build-variant-cfg: devedition diff --git a/taskcluster/ci/static-analysis/kind.yml b/taskcluster/ci/static-analysis/kind.yml index 88df685b656d..a0b07eff5c36 100644 --- a/taskcluster/ci/static-analysis/kind.yml +++ b/taskcluster/ci/static-analysis/kind.yml @@ -92,13 +92,10 @@ jobs: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/clang_debug.py + - builds/taskcluster_firefox_win32_clang_debug.py toolchains: - win32-clang-cl - win32-rust @@ -120,13 +117,10 @@ jobs: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/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_base_win.py - - builds/taskcluster_base_win32.py - - builds/taskcluster_sub_win32/clang.py + - builds/taskcluster_firefox_win32_clang.py toolchains: - win32-clang-cl - win32-rust @@ -148,13 +142,10 @@ jobs: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/clang_debug.py + - builds/taskcluster_firefox_win64_clang_debug.py toolchains: - win64-clang-cl - win64-rust @@ -176,13 +167,10 @@ jobs: 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_base_win.py - - builds/taskcluster_base_win64.py - - builds/taskcluster_sub_win64/clang.py + - builds/taskcluster_firefox_win64_clang.py toolchains: - win64-clang-cl - win64-rust diff --git a/testing/mozharness/configs/builds/taskcluster_base_win.py b/testing/mozharness/configs/builds/taskcluster_base_win.py deleted file mode 100644 index 9da5042208e2..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_base_win.py +++ /dev/null @@ -1,37 +0,0 @@ -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, - - 'publish_nightly_en_US_routes': True, - 'env': { - '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': '%(abs_obj_dir)s', - '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'), - }, -} diff --git a/testing/mozharness/configs/builds/taskcluster_base_win32.py b/testing/mozharness/configs/builds/taskcluster_base_win32.py deleted file mode 100644 index 8f9594e68984..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_base_win32.py +++ /dev/null @@ -1,17 +0,0 @@ -import os - -config = { - 'base_name': 'WINNT_5.2_%(branch)s', - 'platform': 'win32', - 'env': { - 'BINSCOPE': os.path.join( - os.environ['ProgramFiles(x86)'], 'Microsoft', 'SDL BinScope', 'BinScope.exe' - ), - 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x86/srcsrv/pdbstr.exe', - }, - "check_test_env": { - 'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe', - 'MINIDUMP_SAVE_PATH': os.path.join(os.getcwd(), 'public', 'build'), - }, - 'mozconfig_platform': 'win32', -} diff --git a/testing/mozharness/configs/builds/taskcluster_base_win64.py b/testing/mozharness/configs/builds/taskcluster_base_win64.py deleted file mode 100644 index 0cd420f2ff59..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_base_win64.py +++ /dev/null @@ -1,14 +0,0 @@ -import os - -config = { - 'base_name': 'WINNT_6.1_x86-64_%(branch)s', - 'platform': 'win64', - 'env': { - 'PDBSTR_PATH': 'C:/Program Files (x86)/Windows Kits/10/Debuggers/x64/srcsrv/pdbstr.exe', - }, - "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', -} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py new file mode 100644 index 000000000000..8e5510c2bd2c --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py @@ -0,0 +1,71 @@ +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', + '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'], + ######################################################################### + + + ######################################################################### + ###### 32 bit specific ###### + 'base_name': 'WINNT_5.2_%(branch)s', + 'platform': 'win32', + 'stage_platform': 'win32-st-an', + '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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': 'win32', + 'mozconfig_variant': 'clang', + 'artifact_flag_build_variant_in_try': None, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py new file mode 100644 index 000000000000..ffa01e3c8794 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py @@ -0,0 +1,73 @@ +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', + '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'], + ######################################################################### + + + ######################################################################### + ###### 32 bit specific ###### + 'base_name': 'WINNT_5.2_%(branch)s', + 'platform': 'win32', + 'stage_platform': 'win32-st-an-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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': 'win32', + 'mozconfig_variant': 'clang-debug', + 'artifact_flag_build_variant_in_try': None, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win32_noopt_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win32_noopt_debug.py new file mode 100644 index 000000000000..0e91499634d8 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_noopt_debug.py @@ -0,0 +1,74 @@ +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 + # - taskcluster_firefox_win32_noopt_debug + # - taskcluster_firefox_win64_noopt_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, + ######################################################################### + + + ######################################################################### + ###### 32 bit specific ###### + 'base_name': 'WINNT_5.2_%(branch)s', + 'platform': 'win32', + 'stage_platform': 'win32-noopt-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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': 'win32', + 'mozconfig_variant': 'noopt-debug', + 'artifact_flag_build_variant_in_try': None, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win32_rusttests_opt.py b/testing/mozharness/configs/builds/taskcluster_firefox_win32_rusttests_opt.py new file mode 100644 index 000000000000..0da2a49b712f --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_rusttests_opt.py @@ -0,0 +1,70 @@ +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', + '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, + ######################################################################### + + + ######################################################################### + ###### 32 bit specific ###### + 'base_name': 'WINNT_5.2_%(branch)s', + 'platform': 'win32', + 'stage_platform': 'win32-rusttests', + '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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': 'win32', + 'mozconfig_variant': 'rusttests', + 'artifact_flag_build_variant_in_try': None, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py new file mode 100644 index 000000000000..e468d22b58f7 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py @@ -0,0 +1,67 @@ +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', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py new file mode 100644 index 000000000000..e49ce1dec4f2 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py @@ -0,0 +1,65 @@ +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', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_ccov_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_ccov_debug.py new file mode 100644 index 000000000000..a6acdd952784 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_ccov_debug.py @@ -0,0 +1,76 @@ +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, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py new file mode 100644 index 000000000000..5eac5cda1d6f --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py @@ -0,0 +1,67 @@ +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, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py new file mode 100644 index 000000000000..ad810f8deb4d --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py @@ -0,0 +1,69 @@ +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, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py new file mode 100644 index 000000000000..80ba5b2a878d --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py @@ -0,0 +1,68 @@ +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, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_rusttests_opt.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_rusttests_opt.py new file mode 100644 index 000000000000..e8f002534d0c --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_rusttests_opt.py @@ -0,0 +1,67 @@ +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, + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py new file mode 100644 index 000000000000..e8fd732792e9 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py @@ -0,0 +1,69 @@ +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', + '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, + ######################################################################### + + + ######################################################################### + ###### 32 bit specific ###### + 'base_name': 'WINNT 5.2 add-on-devel %(branch)s', + 'platform': 'win32', + 'stage_platform': 'win32-add-on-devel', + 'publish_nightly_en_US_routes': False, + '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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': '32', + 'mozconfig_variant': 'add-on-devel', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py new file mode 100644 index 000000000000..6da463d28442 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py @@ -0,0 +1,71 @@ +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', + '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, + ######################################################################### + + + ######################################################################### + ###### 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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': 'win32', + 'mozconfig_variant': 'debug', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py new file mode 100644 index 000000000000..12adf9453df3 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py @@ -0,0 +1,70 @@ +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', + '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, + ######################################################################### + + + ######################################################################### + ###### 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': '%(abs_obj_dir)s', + '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': os.path.join(os.getcwd(), 'public', 'build'), + }, + 'mozconfig_platform': 'win32', + 'mozconfig_variant': 'nightly', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py new file mode 100644 index 000000000000..a66433da9543 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py @@ -0,0 +1,66 @@ +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', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py new file mode 100644 index 000000000000..6066e418de71 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py @@ -0,0 +1,67 @@ +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', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py new file mode 100644 index 000000000000..2bce52a8538d --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py @@ -0,0 +1,66 @@ +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', + ######################################################################### +} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py deleted file mode 100644 index 3391e243e1ec..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/addondevel.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - # decides whether we want to use moz_sign_cmd in en+ - 'enable_signing': False, - 'base_name': 'WINNT 5.2 add-on-devel %(branch)s', - 'stage_platform': 'win32-add-on-devel', - 'publish_nightly_en_US_routes': False, - 'mozconfig_variant': 'add-on-devel', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/clang.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/clang.py deleted file mode 100644 index afac5f76cbbb..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/clang.py +++ /dev/null @@ -1,6 +0,0 @@ -config = { - 'perfherder_extra_options': ['static-analysis'], - 'stage_platform': 'win32-st-an', - 'mozconfig_variant': 'clang', - 'artifact_flag_build_variant_in_try': None, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/clang_debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/clang_debug.py deleted file mode 100644 index 9f21ed3558de..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/clang_debug.py +++ /dev/null @@ -1,10 +0,0 @@ -config = { - 'perfherder_extra_options': ['static-analysis'], - 'stage_platform': 'win32-st-an-debug', - 'debug_build': True, - 'env': { - 'XPCOM_DEBUG_BREAK': 'stack-and-abort', - }, - 'mozconfig_variant': 'clang-debug', - 'artifact_flag_build_variant_in_try': None, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py deleted file mode 100644 index c6db62f8e34c..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'stage_platform': 'win32-debug', - 'debug_build': True, - 'env': { - 'XPCOM_DEBUG_BREAK': 'stack-and-abort', - }, - 'mozconfig_variant': 'debug', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py deleted file mode 100644 index c8fe8862af22..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py +++ /dev/null @@ -1,9 +0,0 @@ -config = { - 'stage_platform': 'win32-noopt-debug', - 'debug_build': True, - 'env': { - 'XPCOM_DEBUG_BREAK': 'stack-and-abort', - }, - 'mozconfig_variant': 'noopt-debug', - 'artifact_flag_build_variant_in_try': None, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py deleted file mode 100644 index 10e15eb5e643..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/opt.py +++ /dev/null @@ -1,10 +0,0 @@ -config = { - 'default_actions': [ - 'clone-tools', - 'build', - 'check-test', - 'update', - ], - 'stage_platform': 'win32', - 'mozconfig_variant': 'nightly', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py deleted file mode 100644 index fe3cb2730a79..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win32/rusttests_opt.py +++ /dev/null @@ -1,5 +0,0 @@ -config = { - 'stage_platform': 'win32-rusttests', - 'mozconfig_variant': 'rusttests', - 'artifact_flag_build_variant_in_try': None, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py deleted file mode 100644 index 5f719bdce5db..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/addondevel.py +++ /dev/null @@ -1,7 +0,0 @@ -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', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py deleted file mode 100644 index 7c46615ab18b..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'stage_platform': 'win64-asan-debug', - 'debug_build': True, - 'env': { - 'XPCOM_DEBUG_BREAK': 'stack-and-abort', - }, - 'mozconfig_variant': 'debug-asan', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py deleted file mode 100644 index e5cb02516343..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_opt.py +++ /dev/null @@ -1,4 +0,0 @@ -config = { - 'stage_platform': 'win64-asan', - 'mozconfig_variant': 'nightly-asan', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py deleted file mode 100644 index 34163707407a..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_debug.py +++ /dev/null @@ -1,9 +0,0 @@ -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, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/clang.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/clang.py deleted file mode 100644 index e67f13032524..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/clang.py +++ /dev/null @@ -1,6 +0,0 @@ -config = { - 'perfherder_extra_options': ['static-analysis'], - 'stage_platform': 'win64-st-an', - 'mozconfig_variant': 'clang', - 'artifact_flag_build_variant_in_try': None, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/clang_debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/clang_debug.py deleted file mode 100644 index b41a265ffe9e..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/clang_debug.py +++ /dev/null @@ -1,10 +0,0 @@ -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, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py deleted file mode 100644 index 63f6d8bda612..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'stage_platform': 'win64-debug', - 'debug_build': True, - 'env': { - 'XPCOM_DEBUG_BREAK': 'stack-and-abort', - }, - 'mozconfig_variant': 'debug', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py deleted file mode 100644 index cefeb14c6b2e..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py +++ /dev/null @@ -1,9 +0,0 @@ -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, -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py deleted file mode 100644 index 7bb363ed2c3c..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/opt.py +++ /dev/null @@ -1,10 +0,0 @@ -config = { - 'default_actions': [ - 'clone-tools', - 'build', - 'check-test', - 'update', - ], - 'stage_platform': 'win64', - 'mozconfig_variant': 'nightly', -} diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py deleted file mode 100644 index 98922da7c567..000000000000 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'stage_platform': 'win64-rusttests', - 'env': { - 'XPCOM_DEBUG_BREAK': 'stack-and-abort', - }, - 'mozconfig_variant': 'rusttests', - 'artifact_flag_build_variant_in_try': None, -} diff --git a/testing/mozharness/mozharness/base/config.py b/testing/mozharness/mozharness/base/config.py index f21c61ed3ad3..15fc275475d7 100644 --- a/testing/mozharness/mozharness/base/config.py +++ b/testing/mozharness/mozharness/base/config.py @@ -308,11 +308,6 @@ class BaseConfig(object): "keys/values that were not overwritten by another cfg -- " "held the highest hierarchy." ) - self.config_parser.add_option( - "--append-env-variables-from-configs", action="store_true", - dest="append_env_variables_from_configs", - help="Merge environment variables from config files." - ) # Logging log_option_group = OptionGroup(self.config_parser, "Logging") @@ -494,8 +489,7 @@ class BaseConfig(object): options.config_files + options.opt_config_files, options=options )) config = {} - if (self.append_env_variables_from_configs - or options.append_env_variables_from_configs): + if self.append_env_variables_from_configs: # We only append values from various configs for the 'env' entry # For everything else we follow the standard behaviour for i, (c_file, c_dict) in enumerate(self.all_cfg_files_and_dicts):