diff --git a/taskcluster/ci/artifact-build/kind.yml b/taskcluster/ci/artifact-build/kind.yml index 15bd34d7a3bc..ddb821493f80 100644 --- a/taskcluster/ci/artifact-build/kind.yml +++ b/taskcluster/ci/artifact-build/kind.yml @@ -42,7 +42,6 @@ jobs: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true keep-artifacts: false dependencies: linux64-opt: build-linux64/opt diff --git a/taskcluster/ci/build/linux-base-toolchains.yml b/taskcluster/ci/build/linux-base-toolchains.yml index b285fea0b25e..fd6437e85c6d 100644 --- a/taskcluster/ci/build/linux-base-toolchains.yml +++ b/taskcluster/ci/build/linux-base-toolchains.yml @@ -32,7 +32,6 @@ linux64-base-toolchains/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -72,7 +71,6 @@ linux64-base-toolchains/debug: custom-build-variant-cfg: debug mozconfig-variant: debug tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -109,7 +107,6 @@ linux64-base-toolchains-clang/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true fetches: toolchain: - linux64-binutils-2.31.1 @@ -147,7 +144,6 @@ linux64-base-toolchains-clang/debug: custom-build-variant-cfg: debug mozconfig-variant: debug tooltool-downloads: public - need-xvfb: true fetches: toolchain: - linux64-binutils-2.31.1 diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 17e84b1b05f7..b951845fadf6 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -33,7 +33,6 @@ linux64/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true run-on-projects: ['integration'] use-sccache: true fetches: @@ -192,7 +191,6 @@ linux64-gcc/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -278,7 +276,6 @@ linux64-fuzzing/debug: custom-build-variant-cfg: fuzzing-debug mozconfig-variant: debug-fuzzing tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -324,7 +321,6 @@ linux64-fuzzing-noopt/debug: custom-build-variant-cfg: fuzzing-debug mozconfig-variant: debug-fuzzing-noopt tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -372,7 +368,6 @@ linux64/debug: custom-build-variant-cfg: debug mozconfig-variant: debug tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -421,7 +416,6 @@ linux64/codeql-cpp: custom-build-variant-cfg: debug mozconfig-variant: debug tooltool-downloads: public - need-xvfb: true run-on-projects: [] fetches: fetch: @@ -524,7 +518,6 @@ linux64-devedition/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true mozconfig-variant: devedition run-on-projects: ['mozilla-beta'] fetches: @@ -564,7 +557,6 @@ linux/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr102'] use-sccache: true fetches: @@ -607,7 +599,6 @@ linux/debug: custom-build-variant-cfg: debug mozconfig-variant: debug tooltool-downloads: public - need-xvfb: true run-on-projects: ['release'] use-sccache: true fetches: @@ -743,7 +734,6 @@ linux-devedition/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true mozconfig-variant: devedition run-on-projects: ['mozilla-beta'] fetches: @@ -790,7 +780,6 @@ linux-shippable/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true run-on-projects: ['release'] fetches: toolchain: @@ -832,7 +821,6 @@ linux-reproduced/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true # Original comment: Limited to trunk until bug 1596350 is fixed. # Addendum: Do not run on autoland, Bug 1599197 run-on-projects: ['mozilla-central', 'comm-central'] @@ -876,7 +864,6 @@ linux64-reproduced/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true # Original comment: Limited to trunk until bug 1596350 is fixed. # Addendum: Do not run on autoland, Bug 1599197 run-on-projects: ['mozilla-central', 'comm-central'] @@ -917,7 +904,6 @@ linux64-asan/opt: custom-build-variant-cfg: asan-tc mozconfig-variant: nightly-asan tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -958,7 +944,6 @@ linux64-tsan/opt: custom-build-variant-cfg: tsan-tc mozconfig-variant: tsan tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -1002,7 +987,6 @@ linux64-tsan-fuzzing/opt: custom-build-variant-cfg: fuzzing-tsan-tc mozconfig-variant: tsan-fuzzing tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -1048,7 +1032,6 @@ linux64-asan-fuzzing/noopt: custom-build-variant-cfg: fuzzing-asan-tc mozconfig-variant: nightly-fuzzing-asan-noopt tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -1096,7 +1079,6 @@ linux64-asan-fuzzing-nyx/opt: custom-build-variant-cfg: fuzzing-asan-tc mozconfig-variant: nightly-fuzzing-asan-nyx tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -1143,7 +1125,6 @@ linux64-asan-fuzzing/opt: custom-build-variant-cfg: fuzzing-asan-tc mozconfig-variant: nightly-fuzzing-asan tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -1189,7 +1170,6 @@ linux64-asan-fuzzing-ccov/opt: secrets: true mozconfig-variant: asan-fuzzing-ccov tooltool-downloads: public - need-xvfb: true use-sccache: false fetches: toolchain: @@ -1230,7 +1210,6 @@ linux64-fuzzing-ccov/opt: secrets: true mozconfig-variant: fuzzing-ccov tooltool-downloads: public - need-xvfb: true use-sccache: false fetches: toolchain: @@ -1283,7 +1262,6 @@ linux64-asan-reporter-shippable/opt: custom-build-variant-cfg: asan-reporter-tc mozconfig-variant: nightly-asan-reporter tooltool-downloads: public - need-xvfb: true mar-channel-id: firefox-mozilla-central-asan accepted-mar-channel-ids: @@ -1325,7 +1303,6 @@ linux64-asan/debug: custom-build-variant-cfg: asan-tc-and-debug mozconfig-variant: debug-asan tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: @@ -1379,7 +1356,6 @@ linux64-shippable/opt: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true fetches: toolchain: - linux64-binutils @@ -1418,7 +1394,6 @@ linux64-noopt/debug: mozconfig-variant: noopt-debug tooltool-downloads: public keep-artifacts: false - need-xvfb: true run-on-projects: ['mozilla-central'] use-sccache: true fetches: @@ -1549,7 +1524,6 @@ linux64-ccov/opt: custom-build-variant-cfg: code-coverage-opt mozconfig-variant: code-coverage-opt tooltool-downloads: public - need-xvfb: true use-sccache: false fetches: toolchain: @@ -1590,7 +1564,6 @@ linux64-ccov/debug: custom-build-variant-cfg: code-coverage-debug mozconfig-variant: code-coverage-debug tooltool-downloads: public - need-xvfb: true use-sccache: false fetches: toolchain: @@ -1628,7 +1601,6 @@ linux64-add-on-devel/opt: custom-build-variant-cfg: add-on-devel mozconfig-variant: add-on-devel tooltool-downloads: public - need-xvfb: true run-on-projects: ['mozilla-beta', 'mozilla-release'] use-sccache: true fetches: @@ -1671,7 +1643,6 @@ linux64-aarch64/opt: secrets: true mozconfig-variant: opt tooltool-downloads: public - need-xvfb: true run-on-projects: ['integration'] fetches: toolchain: diff --git a/taskcluster/ci/build/windows-mingw.yml b/taskcluster/ci/build/windows-mingw.yml index fd4f2e105926..0aeeb65416c3 100644 --- a/taskcluster/ci/build/windows-mingw.yml +++ b/taskcluster/ci/build/windows-mingw.yml @@ -11,7 +11,6 @@ job-defaults: using: mozharness actions: [build] script: mozharness/scripts/fx_desktop_build.py - need-xvfb: false optimization: skip-unless-expanded: null diff --git a/taskcluster/ci/generate-profile/kind.yml b/taskcluster/ci/generate-profile/kind.yml index e7d06631de6d..b56ec68f95db 100644 --- a/taskcluster/ci/generate-profile/kind.yml +++ b/taskcluster/ci/generate-profile/kind.yml @@ -108,7 +108,6 @@ jobs: path: /builds/worker/artifacts/ run: using: mozharness - need-xvfb: true job-script: taskcluster/scripts/tester/test-linux.sh script: android_emulator_pgo.py tooltool-downloads: internal @@ -148,7 +147,6 @@ jobs: path: /builds/worker/artifacts/ run: using: mozharness - need-xvfb: true job-script: taskcluster/scripts/tester/test-linux.sh script: android_emulator_pgo.py tooltool-downloads: internal diff --git a/taskcluster/ci/release-eme-free-repack/kind.yml b/taskcluster/ci/release-eme-free-repack/kind.yml index da8de4f35141..630d864e8b4e 100644 --- a/taskcluster/ci/release-eme-free-repack/kind.yml +++ b/taskcluster/ci/release-eme-free-repack/kind.yml @@ -32,7 +32,6 @@ job-defaults: - partner_repacks/release_mozilla-release_desktop.py script: mozharness/scripts/desktop_partner_repacks.py job-script: taskcluster/scripts/builder/repackage.sh - need-xvfb: false tooltool-downloads: false extra: limit-locales: diff --git a/taskcluster/ci/release-partner-repack/kind.yml b/taskcluster/ci/release-partner-repack/kind.yml index cf0fb8dd1f6b..32dc2d60b7ae 100644 --- a/taskcluster/ci/release-partner-repack/kind.yml +++ b/taskcluster/ci/release-partner-repack/kind.yml @@ -32,7 +32,6 @@ job-defaults: - partner_repacks/release_mozilla-release_desktop.py script: mozharness/scripts/desktop_partner_repacks.py job-script: taskcluster/scripts/builder/repackage.sh - need-xvfb: false tooltool-downloads: false extra: limit-locales: diff --git a/taskcluster/ci/release-source/kind.yml b/taskcluster/ci/release-source/kind.yml index bf0fe546eced..34d6037ff761 100644 --- a/taskcluster/ci/release-source/kind.yml +++ b/taskcluster/ci/release-source/kind.yml @@ -34,7 +34,6 @@ job-defaults: - builds/releng_sub_linux_configs/64_source.py options: [] tooltool-downloads: public - need-xvfb: false run-on-projects: [] # The build_attrs transform defaults to setting a `skip-unlles-schedules' # optimization based on the task label. The tasks here don't have corresponding diff --git a/taskcluster/ci/valgrind/kind.yml b/taskcluster/ci/valgrind/kind.yml index 7a398b8615e9..3cbb1b004b14 100644 --- a/taskcluster/ci/valgrind/kind.yml +++ b/taskcluster/ci/valgrind/kind.yml @@ -33,6 +33,7 @@ jobs: docker-image: {in-tree: valgrind-build} max-run-time: 72000 env: + NEED_XVFB: "true" PERFHERDER_EXTRA_OPTIONS: valgrind run: using: mozharness @@ -46,7 +47,6 @@ jobs: script: "mozharness/scripts/fx_desktop_build.py" secrets: true tooltool-downloads: public - need-xvfb: true use-sccache: true fetches: toolchain: diff --git a/taskcluster/gecko_taskgraph/transforms/job/mozharness.py b/taskcluster/gecko_taskgraph/transforms/job/mozharness.py index 55a47cdf9b38..6b256e5c8557 100644 --- a/taskcluster/gecko_taskgraph/transforms/job/mozharness.py +++ b/taskcluster/gecko_taskgraph/transforms/job/mozharness.py @@ -78,8 +78,6 @@ mozharness_run_schema = Schema( # If true, taskcluster proxy will be enabled; note that it may also be enabled # automatically e.g., for secrets support. Not supported on Windows. Required("taskcluster-proxy"): bool, - # If true, the build scripts will start Xvfb. Not supported on Windows. - Required("need-xvfb"): bool, # If false, indicate that builds should skip producing artifacts. Not # supported on Windows. Required("keep-artifacts"): bool, @@ -107,7 +105,6 @@ mozharness_defaults = { "tooltool-downloads": False, "secrets": False, "taskcluster-proxy": False, - "need-xvfb": False, "keep-artifacts": True, "requires-signed-builds": False, "use-simple-package": True, @@ -202,12 +199,6 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc): env["DIST_TARGET_UPLOADS"] = "" env["DIST_UPLOADS"] = "" - # Xvfb - if run.pop("need-xvfb"): - env["NEED_XVFB"] = "true" - else: - env["NEED_XVFB"] = "false" - # Retry if mozharness returns TBPL_RETRY worker["retry-exit-status"] = [4] @@ -240,9 +231,6 @@ def mozharness_on_generic_worker(config, job, taskdesc): # fail if invalid run options are included invalid = [] - for prop in ["need-xvfb"]: - if prop in run and run.pop(prop): - invalid.append(prop) if not run.pop("keep-artifacts", True): invalid.append("keep-artifacts") if invalid: diff --git a/taskcluster/gecko_taskgraph/transforms/l10n.py b/taskcluster/gecko_taskgraph/transforms/l10n.py index 2771ba73d650..f817e37448cf 100644 --- a/taskcluster/gecko_taskgraph/transforms/l10n.py +++ b/taskcluster/gecko_taskgraph/transforms/l10n.py @@ -387,8 +387,6 @@ def make_job_description(config, jobs): job_description["worker"]["os"] = "windows" job_description["run"]["use-simple-package"] = False job_description["run"]["use-magic-mh-args"] = False - else: - job_description["run"]["need-xvfb"] = True if job.get("docker-image"): job_description["worker"]["docker-image"] = job["docker-image"]