mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Backed out changeset dd2f16711aba (bug 1606922) for causing build failures
CLOSED TREE
This commit is contained in:
parent
d926e77afc
commit
3215317bdc
@ -1,5 +1,6 @@
|
||||
. $topsrcdir/browser/config/mozconfigs/linux32/nightly
|
||||
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=0"
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_CHECK=0
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/build/mozconfig.common"
|
||||
|
@ -1,5 +1,6 @@
|
||||
. $topsrcdir/browser/config/mozconfigs/linux64/nightly
|
||||
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=0"
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
|
||||
|
@ -1,6 +1,7 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_PACKAGE=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_CHECK=0
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. $topsrcdir/build/macosx/mozconfig.common
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. $topsrcdir/build/macosx/mozconfig.common
|
||||
|
@ -1,5 +1,6 @@
|
||||
. $topsrcdir/browser/config/mozconfigs/macosx64/nightly
|
||||
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=0"
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
|
@ -1,5 +1,6 @@
|
||||
. $topsrcdir/browser/config/mozconfigs/win32/nightly
|
||||
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=0"
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/debug"
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_CHECK=0
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
. $topsrcdir/browser/config/mozconfigs/win64/nightly
|
||||
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=0"
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/win64/nightly"
|
||||
|
@ -1,4 +1,5 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/win64/debug"
|
||||
|
@ -12,12 +12,9 @@
|
||||
mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=${MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_CHECK=${MOZ_AUTOMATION_CHECK-1}"
|
||||
|
||||
# The following variables are expected to be exported by Taskcluster
|
||||
# configuration files rather than mozconfig files
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-0}"
|
||||
|
||||
export MOZ_AUTOMATION_MOZCONFIG=1
|
||||
|
@ -13,6 +13,7 @@ MOZ_HAZARD=1
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_PACKAGE=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
|
||||
ac_add_options --enable-js-shell
|
||||
|
@ -2,6 +2,7 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_PACKAGE=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS=0
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_PACKAGE=0
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS=0
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-16/nightly"
|
||||
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=0"
|
||||
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
|
||||
|
||||
ac_add_options --enable-profile-generate
|
||||
|
@ -55,7 +55,6 @@ android-api-16/debug:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
@ -147,7 +146,6 @@ android-api-16/opt:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
@ -171,7 +169,6 @@ android-api-16/pgo:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
@ -221,7 +218,6 @@ android-aarch64/opt:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
@ -245,7 +241,6 @@ android-aarch64/pgo:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
@ -317,7 +312,6 @@ android-x86_64/opt:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
@ -367,7 +361,6 @@ android-x86_64/debug:
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
config: ["builds/releng_base_android_64_builds.py"]
|
||||
|
@ -16,8 +16,6 @@ linux64/opt:
|
||||
worker-type: b-linux
|
||||
worker:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -132,8 +130,6 @@ linux64/debug:
|
||||
worker-type: b-linux
|
||||
worker:
|
||||
max-run-time: 5400
|
||||
env:
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -215,8 +211,6 @@ linux64-devedition-nightly/opt:
|
||||
worker-type: b-linux
|
||||
worker:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -618,8 +612,6 @@ linux-shippable/opt:
|
||||
worker:
|
||||
docker-image: {in-tree: debian7-i386-build}
|
||||
max-run-time: 9000
|
||||
env:
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -700,7 +692,6 @@ linux64-asan/opt:
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "opt asan"
|
||||
ASAN_OPTIONS: "detect_leaks=0"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
max-run-time: 5400
|
||||
run:
|
||||
using: mozharness
|
||||
@ -1030,8 +1021,6 @@ linux64-shippable/opt:
|
||||
worker-type: b-linux
|
||||
worker:
|
||||
max-run-time: 9000
|
||||
env:
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -1231,7 +1220,6 @@ linux64-ccov/opt:
|
||||
env:
|
||||
FORCE_GCC: '1'
|
||||
RUSTC_BOOTSTRAP: '1'
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
|
@ -18,7 +18,6 @@ macosx64/debug:
|
||||
max-run-time: 5400
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -190,7 +189,6 @@ macosx64-devedition-nightly/opt:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -323,7 +321,6 @@ macosx64-shippable/opt:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
@ -363,7 +360,6 @@ macosx64-ccov/debug:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
|
||||
RUSTC_BOOTSTRAP: '1'
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [get-secrets, build]
|
||||
|
@ -25,7 +25,6 @@ win32-mingwclang/opt:
|
||||
worker:
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "opt 32 clang"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
@ -57,7 +56,6 @@ win32-mingwclang/debug:
|
||||
worker:
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "debug 32 clang"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
@ -89,7 +87,6 @@ win64-mingwclang/opt:
|
||||
worker:
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "opt 64 clang"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
@ -121,7 +118,6 @@ win64-mingwclang/debug:
|
||||
worker:
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "debug 64 clang"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
|
@ -28,7 +28,6 @@ win32/debug:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -66,7 +65,6 @@ win32/opt:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -105,7 +103,6 @@ win64/debug:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -217,7 +214,6 @@ win64/opt:
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -307,7 +303,6 @@ win32-shippable/opt:
|
||||
max-run-time: 10800
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -349,7 +344,6 @@ win64-shippable/opt:
|
||||
max-run-time: 10800
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -683,7 +677,6 @@ win64-ccov/opt:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
RUSTC_BOOTSTRAP: '1'
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -756,7 +749,6 @@ win64-asan/opt:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
PERFHERDER_EXTRA_OPTIONS: "opt asan"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
@ -892,7 +884,6 @@ win32-devedition-nightly/opt:
|
||||
max-run-time: 10800
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
secrets: true
|
||||
@ -936,7 +927,6 @@ win64-devedition-nightly/opt:
|
||||
max-run-time: 10800
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
|
@ -261,47 +261,3 @@ def verify_nightly_no_sccache(task, taskgraph, scratch_pad, graph_config):
|
||||
if task.task.get('payload', {}).get('env', {}).get('USE_SCCACHE'):
|
||||
raise Exception(
|
||||
'Nightly job {} cannot use sccache'.format(task.label))
|
||||
|
||||
|
||||
@verifications.add('full_task_graph')
|
||||
def verify_test_packaging(task, taskgraph, scratch_pad, graph_config):
|
||||
if task is None:
|
||||
for task in taskgraph.tasks.itervalues():
|
||||
if task.kind == 'build':
|
||||
build_env = task.task.get('payload', {}).get('env', {})
|
||||
# Note that MOZ_AUTOMATION_PACKAGE_TESTS can be explicitly set
|
||||
# to 0 in the task environment for the rare cases where we don't
|
||||
# want to package tests for shippable builds or builds that have
|
||||
# tests. For this reason, the checks below compare package_tests
|
||||
# to None rather than checking to see if it equals '1'.
|
||||
package_tests = build_env.get('MOZ_AUTOMATION_PACKAGE_TESTS')
|
||||
shippable = task.attributes.get('shippable', False)
|
||||
build_has_tests = scratch_pad.get(task.label)
|
||||
|
||||
if package_tests is None:
|
||||
# Shippable builds should always package tests.
|
||||
if shippable:
|
||||
raise Exception('Build job {} is shippable and does not specify '
|
||||
'MOZ_AUTOMATION_PACKAGE_TESTS=1 in the '
|
||||
'environment.'.format(task.label))
|
||||
|
||||
# Build tasks in the scratch pad have tests dependent on
|
||||
# them, so we need to package tests during build.
|
||||
if build_has_tests:
|
||||
raise Exception(
|
||||
'Build job {} has tests dependent on it and does not specify '
|
||||
'MOZ_AUTOMATION_PACKAGE_TESTS=1 in the environment'.format(task.label))
|
||||
else:
|
||||
# Build tasks that aren't in the scratch pad have no
|
||||
# dependent tests, so we shouldn't package tests.
|
||||
if not build_has_tests:
|
||||
raise Exception(
|
||||
'Build job {} has no tests, but specifies '
|
||||
'MOZ_AUTOMATION_PACKAGE_TESTS={} in the environment. '
|
||||
'Unset MOZ_AUTOMATION_PACKAGE_TESTS in the task definition '
|
||||
'to fix.'.format(
|
||||
task.label, package_tests))
|
||||
return
|
||||
if task.kind == 'test':
|
||||
build_task = taskgraph[task.dependencies['build']]
|
||||
scratch_pad[build_task.label] = 1
|
||||
|
Loading…
Reference in New Issue
Block a user