mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1735398 - Update and move the FFMPEG binaries out of the non-standard repository. r=perftest-reviewers,sparky 

What we are doing:
- Upgrading FFMPEG version from 4.1.4 to 4.4.1
- Moving the binaries out of a personal github to the perf-automation mozilla repository

Differential Revision: https://phabricator.services.mozilla.com/D155411
This commit is contained in:
andrej 2022-10-12 13:19:02 +00:00
Родитель 14e66fd517
Коммит 92af5e8351
4 изменённых файлов: 33 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

30
taskcluster/ci/fetch/browsertime.yml
Просмотреть файл

@ -2,32 +2,32 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
---
win64-ffmpeg-4.1.1:
win64-ffmpeg-4.4.1:
description: 'Win64 ffmpeg'
fetch:
type: static-url
# url: https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.1.1-win64-static.zip is 403 (from AWS only?).
url: https://github.com/ncalexan/geckodriver/releases/download/v0.24.0-android/ffmpeg-4.1.1-win64-static.zip
sha256: 2c19658d69de08ea7ef585fbf801ef6a364795b5288e23d79066876ff0465df6
size: 66347524
# url: https://github.com/GyanD/codexffmpeg/releases/tag/4.4.1
url: https://github.com/mozilla/perf-automation/releases/download/FFMPEG-v4.4.1/ffmpeg-4.4.1-full_build.zip
sha256: f0f407041f82905c310b79f4f76973815700d1e438a10c3cbce66a345ff4f457
size: 134760541
linux64-ffmpeg-4.1.4:
linux64-ffmpeg-4.4.1:
description: 'Linux64 ffmpeg'
fetch:
type: static-url
# url: https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.1.4-i686-static.tar.xz is 406 (from AWS only?).
url: https://github.com/ncalexan/geckodriver/releases/download/v0.24.0-android/ffmpeg-4.1.4-i686-static.tar.xz
sha256: f7a2f0f8f91506d67f80fbe5b8a5c264d0fb60cb3cd258d03344890fbd55e6fd
size: 16633296
# url: https://www.johnvansickle.com/ffmpeg/old-releases/
url: https://github.com/mozilla/perf-automation/releases/download/FFMPEG-v4.4.1/ffmpeg-4.4.1-i686-static.tar.xz
sha256: 1f38d1c99b6eb3d36f709a481f5a5526448567a800ee9cddcfe4be54f8b68e62
size: 17592088
mac64-ffmpeg-4.1.1:
mac64-ffmpeg-4.4.1:
description: 'Mac64 ffmpeg'
fetch:
type: static-url
# url: https://ffmpeg.zeranoe.com/builds/macos64/static/ffmpeg-4.1.1-macos64-static.zip is 403 (from AWS only?).
url: https://github.com/ncalexan/geckodriver/releases/download/v0.24.0-android/ffmpeg-4.1.1-macos64-static.zip
sha256: 8612d1e07901779e7ed0eeb5433aea37c7bbaf308d725741f432f454a9f97275
size: 66853411
# url: https://evermeet.cx/pub/ffmpeg/
url: https://github.com/mozilla/perf-automation/releases/download/FFMPEG-v4.4.1/ffmpeg-macos.zip
sha256: 9d07411bce176f56314cc5624f5df51f9cffa76a59e3e81abe2175d4ebaf87ae
size: 49100208
linux64-chromedriver:
description: 'Linux64 chromedriver'

18
taskcluster/gecko_taskgraph/transforms/test/other.py
Просмотреть файл

@ -320,12 +320,12 @@ def setup_browsertime(config, tasks):
fs = {
"by-test-platform": {
"android.*": ["linux64-ffmpeg-4.1.4"],
"linux.*": ["linux64-ffmpeg-4.1.4"],
"macosx.*": ["mac64-ffmpeg-4.1.1"],
"windows.*aarch64.*": ["win64-ffmpeg-4.1.1"],
"windows.*-32.*": ["win64-ffmpeg-4.1.1"],
"windows.*-64.*": ["win64-ffmpeg-4.1.1"],
"android.*": ["linux64-ffmpeg-4.4.1"],
"linux.*": ["linux64-ffmpeg-4.4.1"],
"macosx.*": ["mac64-ffmpeg-4.4.1"],
"windows.*aarch64.*": ["win64-ffmpeg-4.4.1"],
"windows.*-32.*": ["win64-ffmpeg-4.4.1"],
"windows.*-64.*": ["win64-ffmpeg-4.4.1"],
},
}
@ -426,7 +426,7 @@ def setup_browsertime(config, tasks):
"--browsertime-chromedriver",
"$MOZ_FETCHES_DIR/" + cd_extracted_name["windows"],
"--browsertime-ffmpeg",
"$MOZ_FETCHES_DIR/ffmpeg-4.1.1-win64-static/bin/ffmpeg.exe",
"$MOZ_FETCHES_DIR/ffmpeg-4.4.1-full_build/bin/ffmpeg.exe",
],
"macosx.*": [
"--browsertime-node",
@ -436,7 +436,7 @@ def setup_browsertime(config, tasks):
"--browsertime-chromedriver",
"$MOZ_FETCHES_DIR/" + cd_extracted_name["mac"],
"--browsertime-ffmpeg",
"$MOZ_FETCHES_DIR/ffmpeg-4.1.1-macos64-static/bin/ffmpeg",
"$MOZ_FETCHES_DIR/ffmpeg-macos/ffmpeg",
],
"default": [
"--browsertime-node",
@ -446,7 +446,7 @@ def setup_browsertime(config, tasks):
"--browsertime-chromedriver",
"$MOZ_FETCHES_DIR/" + cd_extracted_name["default"],
"--browsertime-ffmpeg",
"$MOZ_FETCHES_DIR/ffmpeg-4.1.4-i686-static/ffmpeg",
"$MOZ_FETCHES_DIR/ffmpeg-4.4.1-i686-static/ffmpeg",
],
}
}

7
testing/mozharness/mozharness/mozilla/testing/raptor.py
Просмотреть файл

@ -74,9 +74,9 @@ RaptorErrorList = (
# the users locally cached ffmpeg binary from from when the user
# ran `./mach browsertime --setup`
FFMPEG_LOCAL_CACHE = {
"mac": "ffmpeg-4.1.1-macos64-static",
"linux": "ffmpeg-4.1.4-i686-static",
"win": "ffmpeg-4.1.1-win64-static",
"mac": "ffmpeg-macos",
"linux": "ffmpeg-4.4.1-i686-static",
"win": "ffmpeg-4.4.1-full_build",
}
@ -1164,7 +1164,6 @@ class Raptor(
path_to_ffmpeg = os.path.join(
btime_cache,
FFMPEG_LOCAL_CACHE["mac"],
"bin",
)
elif "linux" in platform:
path_to_ffmpeg = os.path.join(

12
tools/browsertime/mach_commands.py
Просмотреть файл

@ -176,25 +176,25 @@ host_fetches = {
"darwin": {
"ffmpeg": {
"type": "static-url",
"url": "https://github.com/ncalexan/geckodriver/releases/download/v0.24.0-android/ffmpeg-4.1.1-macos64-static.zip", # noqa
"url": "https://github.com/mozilla/perf-automation/releases/download/FFMPEG-v4.4.1/ffmpeg-macos.zip", # noqa
# An extension to `fetch` syntax.
"path": "ffmpeg-4.1.1-macos64-static",
"path": "ffmpeg-macos",
},
},
"linux64": {
"ffmpeg": {
"type": "static-url",
"url": "https://github.com/ncalexan/geckodriver/releases/download/v0.24.0-android/ffmpeg-4.1.4-i686-static.tar.xz", # noqa
"url": "https://github.com/mozilla/perf-automation/releases/download/FFMPEG-v4.4.1/ffmpeg-4.4.1-i686-static.tar.xz", # noqa
# An extension to `fetch` syntax.
"path": "ffmpeg-4.1.4-i686-static",
"path": "ffmpeg-4.4.1-i686-static",
},
},
"win64": {
"ffmpeg": {
"type": "static-url",
"url": "https://github.com/ncalexan/geckodriver/releases/download/v0.24.0-android/ffmpeg-4.1.1-win64-static.zip", # noqa
"url": "https://github.com/mozilla/perf-automation/releases/download/FFMPEG-v4.4.1/ffmpeg-4.4.1-full_build.zip", # noqa
# An extension to `fetch` syntax.
"path": "ffmpeg-4.1.1-win64-static",
"path": "ffmpeg-4.4.1-full_build-win",
},
},
}