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
This commit is contained in:
Chris Manchester 2018-11-08 18:38:26 +00:00
Родитель 45c16653f9
Коммит 0160b3540d
11 изменённых файлов: 35 добавлений и 4 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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:

Просмотреть файл

@ -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,
#######################
}

Просмотреть файл

@ -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,
#######################
}

Просмотреть файл

@ -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,
#######################
}

Просмотреть файл

@ -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,
}

Просмотреть файл

@ -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,
}