From 0160b3540d17bb6792b0eeb1e49b531924c66029 Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Thu, 8 Nov 2018 18:38:26 +0000 Subject: [PATCH] Bug 1505072 - Automation and mozconfig changes to convert rusttests builds to use non-default build target. r=froydnj Two mozconfg additions are necessary for these jobs on linux: 1.) Turning off the clang plugin, which will not get built during these builds and will cause failures when C/C++ needed by the rust build tries to find it. 2.) Adding --output-sync=line to our make invocation: at some point the "export" phase started relying on this, and it's missing because the non-default build targets invoked by the rusttests builds don't go through client.mk. Differential Revision: https://phabricator.services.mozilla.com/D11242 --HG-- extra : moz-landing-system : lando --- browser/config/mozconfigs/linux32/rusttests | 3 +++ browser/config/mozconfigs/linux32/rusttests-debug | 3 +++ browser/config/mozconfigs/linux64/rusttests | 3 +++ browser/config/mozconfigs/linux64/rusttests-debug | 3 +++ taskcluster/ci/build/linux.yml | 8 ++++---- taskcluster/ci/build/windows.yml | 6 ++++++ .../builds/releng_sub_linux_configs/32_rusttests.py | 2 ++ .../builds/releng_sub_linux_configs/32_rusttests_debug.py | 2 ++ .../builds/releng_sub_linux_configs/64_rusttests.py | 2 ++ .../builds/releng_sub_linux_configs/64_rusttests_debug.py | 2 ++ .../configs/builds/taskcluster_sub_win64/rusttests_opt.py | 5 +++++ 11 files changed, 35 insertions(+), 4 deletions(-) diff --git a/browser/config/mozconfigs/linux32/rusttests b/browser/config/mozconfigs/linux32/rusttests index 832caeadd91b..f49d34228eec 100644 --- a/browser/config/mozconfigs/linux32/rusttests +++ b/browser/config/mozconfigs/linux32/rusttests @@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0 MOZ_AUTOMATION_L10N_CHECK=0 ac_add_options --enable-rust-tests +mk_add_options MOZ_MAKE_FLAGS=--output-sync=line . "$topsrcdir/browser/config/mozconfigs/linux32/nightly" + +unset ENABLE_CLANG_PLUGIN diff --git a/browser/config/mozconfigs/linux32/rusttests-debug b/browser/config/mozconfigs/linux32/rusttests-debug index 21f43445a9a8..72f408130ae1 100644 --- a/browser/config/mozconfigs/linux32/rusttests-debug +++ b/browser/config/mozconfigs/linux32/rusttests-debug @@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0 MOZ_AUTOMATION_L10N_CHECK=0 ac_add_options --enable-rust-tests +mk_add_options MOZ_MAKE_FLAGS=--output-sync=line . "$topsrcdir/browser/config/mozconfigs/linux32/debug" + +unset ENABLE_CLANG_PLUGIN diff --git a/browser/config/mozconfigs/linux64/rusttests b/browser/config/mozconfigs/linux64/rusttests index 464161c17d94..a5b3cf3cdb47 100644 --- a/browser/config/mozconfigs/linux64/rusttests +++ b/browser/config/mozconfigs/linux64/rusttests @@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0 MOZ_AUTOMATION_L10N_CHECK=0 ac_add_options --enable-rust-tests +mk_add_options MOZ_MAKE_FLAGS=--output-sync=line . "$topsrcdir/browser/config/mozconfigs/linux64/nightly" + +unset ENABLE_CLANG_PLUGIN diff --git a/browser/config/mozconfigs/linux64/rusttests-debug b/browser/config/mozconfigs/linux64/rusttests-debug index 8ffcee0082b5..78f00096d227 100644 --- a/browser/config/mozconfigs/linux64/rusttests-debug +++ b/browser/config/mozconfigs/linux64/rusttests-debug @@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0 MOZ_AUTOMATION_L10N_CHECK=0 ac_add_options --enable-rust-tests +mk_add_options MOZ_MAKE_FLAGS=--output-sync=line . "$topsrcdir/browser/config/mozconfigs/linux64/debug" + +unset ENABLE_CLANG_PLUGIN diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index c19410347f78..a90b49401ca8 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -424,7 +424,7 @@ linux-rusttests/opt: PERFHERDER_EXTRA_OPTIONS: rusttests run: using: mozharness - actions: [get-secrets, build, check-test] + actions: [get-secrets, build] config: - builds/releng_base_firefox.py - builds/releng_base_linux_32_builds.py @@ -461,7 +461,7 @@ linux-rusttests/debug: PERFHERDER_EXTRA_OPTIONS: rusttests run: using: mozharness - actions: [get-secrets, build, check-test] + actions: [get-secrets, build] config: - builds/releng_base_firefox.py - builds/releng_base_linux_32_builds.py @@ -858,7 +858,7 @@ linux64-rusttests/opt: PERFHERDER_EXTRA_OPTIONS: rusttests run: using: mozharness - actions: [get-secrets, build, check-test] + actions: [get-secrets, build] config: - builds/releng_base_firefox.py - builds/releng_base_linux_64_builds.py @@ -894,7 +894,7 @@ linux64-rusttests/debug: PERFHERDER_EXTRA_OPTIONS: rusttests run: using: mozharness - actions: [get-secrets, build, check-test] + actions: [get-secrets, build] config: - builds/releng_base_firefox.py - builds/releng_base_linux_64_builds.py diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index f38ddadc4746..c2832c161aa7 100755 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -509,6 +509,7 @@ win32-rusttests/opt: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" run: using: mozharness + actions: [build] options: [append-env-variables-from-configs] script: mozharness/scripts/fx_desktop_build.py config: @@ -518,6 +519,8 @@ win32-rusttests/opt: extra-config: stage_platform: win32-rusttests artifact_flag_build_variant_in_try: null + build_targets: ['pre-export', 'export', 'recurse_rusttests'] + disable_package_metrics: true mozconfig-variant: rusttests run-on-projects: ['trunk', 'try'] toolchains: @@ -544,6 +547,7 @@ win32-rusttests/debug: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest" run: using: mozharness + actions: [build] options: [append-env-variables-from-configs] script: mozharness/scripts/fx_desktop_build.py config: @@ -553,6 +557,8 @@ win32-rusttests/debug: extra-config: stage_platform: win32-rusttests artifact_flag_build_variant_in_try: null + build_targets: ['pre-export', 'export', 'recurse_rusttests'] + disable_package_metrics: true mozconfig-variant: rusttests-debug run-on-projects: ['trunk', 'try'] toolchains: diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py index 1d3a64fcf5bd..92018b8f7c25 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py @@ -17,7 +17,9 @@ config = { 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TINDERBOX_OUTPUT': '1', }, + 'build_targets': ['pre-export', 'export', 'recurse_rusttests'], 'mozconfig_variant': 'rusttests', 'artifact_flag_build_variant_in_try': None, + 'disable_package_metrics': True, ####################### } diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py index a75b1d8eca72..2d76ae16226c 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py @@ -18,6 +18,8 @@ config = { 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TINDERBOX_OUTPUT': '1', }, + 'build_targets': ['pre-export', 'export', 'recurse_rusttests'], 'artifact_flag_build_variant_in_try': None, + 'disable_package_metrics': True, ####################### } diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py index 970396310aee..72d5347212b2 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py @@ -17,6 +17,8 @@ config = { 'PATH': ':/usr/local/bin:/bin:\ /usr/bin:/usr/local/sbin:/usr/sbin:/sbin', }, + 'build_targets': ['pre-export', 'export', 'recurse_rusttests'], 'artifact_flag_build_variant_in_try': None, + 'disable_package_metrics': True, ####################### } diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py index 10946afed9da..cbc932268bd6 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py @@ -17,5 +17,7 @@ config = { 'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin', 'TINDERBOX_OUTPUT': '1', }, + 'build_targets': ['pre-export', 'export', 'recurse_rusttests'], 'artifact_flag_build_variant_in_try': None, + 'disable_package_metrics': True, } diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py index 59944d8ee5c9..2a680044e011 100644 --- a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py +++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py @@ -1,7 +1,12 @@ config = { + 'default_actions': [ + 'build', + ], 'stage_platform': 'win64-rusttests', 'env': { 'XPCOM_DEBUG_BREAK': 'stack-and-abort', }, + 'build_targets': ['pre-export', 'export', 'recurse_rusttests'], + 'disable_package_metrics': True, 'artifact_flag_build_variant_in_try': None, }