From 06b8d461cc619927ea6a2dd84268cc0ab697c9db Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Tue, 31 Oct 2017 21:01:51 -0600 Subject: [PATCH] Bug 1418141: Combine taskcluster win base configs. r=jlund MozReview-Commit-ID: 1CK5xdCUHbq --HG-- extra : rebase_source : 34445b0bdd85ecbea97bc45abd1b1b4f4c095cef --- taskcluster/ci/build/windows.yml | 21 +++++++++++ taskcluster/ci/static-analysis/kind.yml | 4 ++ .../configs/builds/taskcluster_base_win.py | 37 +++++++++++++++++++ .../configs/builds/taskcluster_base_win32.py | 32 ---------------- .../configs/builds/taskcluster_base_win64.py | 32 ---------------- 5 files changed, 62 insertions(+), 64 deletions(-) create mode 100644 testing/mozharness/configs/builds/taskcluster_base_win.py diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index 91daebd35eb8..d30d395a936b 100755 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -18,6 +18,7 @@ win32/debug: 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 toolchains: @@ -45,6 +46,7 @@ win32/opt: 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 toolchains: @@ -72,6 +74,7 @@ win32-dmd/opt: 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 custom-build-variant-cfg: dmd @@ -101,6 +104,7 @@ win32/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 toolchains: @@ -128,6 +132,7 @@ win64/debug: 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 toolchains: @@ -155,6 +160,7 @@ win64/opt: 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 toolchains: @@ -182,6 +188,7 @@ win64-dmd/opt: 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 custom-build-variant-cfg: dmd @@ -215,6 +222,7 @@ win32-nightly/opt: 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 - disable_signing.py @@ -248,6 +256,7 @@ win64-nightly/opt: 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 - disable_signing.py @@ -277,6 +286,7 @@ win64/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 toolchains: @@ -304,6 +314,7 @@ win32-add-on-devel/opt: 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 - balrog/production.py @@ -333,6 +344,7 @@ win64-add-on-devel/opt: 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 - balrog/production.py @@ -362,6 +374,7 @@ win64-noopt/debug: 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 run-on-projects: ['trunk', 'try'] @@ -390,6 +403,7 @@ win32-noopt/debug: 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 run-on-projects: ['trunk', 'try'] @@ -418,6 +432,7 @@ win32-rusttests/opt: 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 run-on-projects: ['trunk', 'try'] @@ -446,6 +461,7 @@ win64-rusttests/opt: 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 run-on-projects: ['trunk', 'try'] @@ -474,6 +490,7 @@ win64-ccov/debug: 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 run-on-projects: [] @@ -503,6 +520,7 @@ win64-asan/debug: 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 run-on-projects: [] @@ -532,6 +550,7 @@ win64-asan/opt: 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 run-on-projects: [] @@ -563,6 +582,7 @@ win32-devedition-nightly/opt: 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 - disable_signing.py @@ -597,6 +617,7 @@ win64-devedition-nightly/opt: 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 - disable_signing.py diff --git a/taskcluster/ci/static-analysis/kind.yml b/taskcluster/ci/static-analysis/kind.yml index ca4c7527676c..88df685b656d 100644 --- a/taskcluster/ci/static-analysis/kind.yml +++ b/taskcluster/ci/static-analysis/kind.yml @@ -96,6 +96,7 @@ jobs: 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 toolchains: @@ -123,6 +124,7 @@ jobs: 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 toolchains: @@ -150,6 +152,7 @@ jobs: 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 toolchains: @@ -177,6 +180,7 @@ jobs: 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 toolchains: diff --git a/testing/mozharness/configs/builds/taskcluster_base_win.py b/testing/mozharness/configs/builds/taskcluster_base_win.py new file mode 100644 index 000000000000..9da5042208e2 --- /dev/null +++ b/testing/mozharness/configs/builds/taskcluster_base_win.py @@ -0,0 +1,37 @@ +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 index 4f34b2c9978e..8f9594e68984 100644 --- a/testing/mozharness/configs/builds/taskcluster_base_win32.py +++ b/testing/mozharness/configs/builds/taskcluster_base_win32.py @@ -1,45 +1,13 @@ 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, - - ###### 32 bit specific ###### 'base_name': 'WINNT_5.2_%(branch)s', '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', diff --git a/testing/mozharness/configs/builds/taskcluster_base_win64.py b/testing/mozharness/configs/builds/taskcluster_base_win64.py index 5a13ff27ae52..0cd420f2ff59 100644 --- a/testing/mozharness/configs/builds/taskcluster_base_win64.py +++ b/testing/mozharness/configs/builds/taskcluster_base_win64.py @@ -1,42 +1,10 @@ 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',