mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Backed out changeset c7ddd550008c (bug 1171736) for breaking gecko-decision opt. r=backout on a CLOSED TREE
This commit is contained in:
Sebastian Hengst
parent
1c1bc5647d
commit
faf31d5017
@ -18,9 +18,7 @@ flags:
|
||||
- android-api-15-frontend
|
||||
- android-partner-sample1
|
||||
- linux
|
||||
- linux-l10n # Desktop l10n
|
||||
- linux64
|
||||
- linux64-l10n # Desktop l10n
|
||||
- linux64-st-an
|
||||
- linux64-artifact
|
||||
- linux64-asan
|
||||
|
||||
@ -15,8 +15,6 @@ builds:
|
||||
linux:
|
||||
platforms:
|
||||
- Linux
|
||||
extra-builds: # see RIDEALONG_BUILDS in `mach taskgraph`
|
||||
- linux-l10n
|
||||
types:
|
||||
opt:
|
||||
task: tasks/builds/opt_linux32.yml
|
||||
@ -26,7 +24,6 @@ builds:
|
||||
platforms:
|
||||
- Linux64
|
||||
extra-builds: # see RIDEALONG_BUILDS in `mach taskgraph`
|
||||
- linux64-l10n
|
||||
- sm-plain
|
||||
- sm-nonunified
|
||||
- sm-arm-sim
|
||||
|
||||
@ -31,21 +31,6 @@ builds:
|
||||
task: tasks/builds/opt_linux32.yml
|
||||
debug:
|
||||
task: tasks/builds/dbg_linux32.yml
|
||||
linux-l10n:
|
||||
platforms:
|
||||
- Linux64
|
||||
types:
|
||||
opt:
|
||||
task: tasks/builds/firefox_l10n_linux32.yml
|
||||
when:
|
||||
file_patterns:
|
||||
- browser/locales/all-locales
|
||||
- python/compare-locales/**
|
||||
- testing/mozharness/configs/single_locale/**
|
||||
- testing/mozharness/mozharness/mozilla/l10n/locales.py
|
||||
- testing/mozharness/scripts/desktop_l10n.py
|
||||
- toolkit/locales/**
|
||||
- toolkit/mozapps/installer/**
|
||||
linux64:
|
||||
platforms:
|
||||
- Linux64
|
||||
@ -54,21 +39,6 @@ builds:
|
||||
task: tasks/builds/opt_linux64.yml
|
||||
debug:
|
||||
task: tasks/builds/dbg_linux64.yml
|
||||
linux64-l10n:
|
||||
platforms:
|
||||
- Linux64
|
||||
types:
|
||||
opt:
|
||||
task: tasks/builds/firefox_l10n_linux64.yml
|
||||
when:
|
||||
file_patterns:
|
||||
- browser/locales/all-locales
|
||||
- python/compare-locales/**
|
||||
- testing/mozharness/configs/single_locale/**
|
||||
- testing/mozharness/mozharness/mozilla/l10n/locales.py
|
||||
- testing/mozharness/scripts/desktop_l10n.py
|
||||
- toolkit/locales/**
|
||||
- toolkit/mozapps/installer/**
|
||||
linux64-st-an:
|
||||
platforms:
|
||||
- Linux64 Static Analysis
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
$inherits:
|
||||
from: 'tasks/l10n.yml'
|
||||
variables:
|
||||
platform: 'linux64'
|
||||
build_name: 'linux64-l10n'
|
||||
build_product: 'firefox'
|
||||
build_type: 'opt'
|
||||
docker-image: desktop-build
|
||||
task:
|
||||
scopes:
|
||||
- 'docker-worker:cache:tooltool-cache'
|
||||
- 'docker-worker:relengapi-proxy:tooltool.download.public'
|
||||
- 'docker-worker:cache:level-{{level}}-{{project}}-{{build_name}}-workspace'
|
||||
|
||||
payload:
|
||||
image:
|
||||
type: 'task-image'
|
||||
path: 'public/image.tar'
|
||||
taskId:
|
||||
task-reference: "<docker-image>"
|
||||
cache:
|
||||
tooltool-cache: '/home/worker/tooltool-cache'
|
||||
level-{{level}}-{{project}}-l10n-{{build_name}}-workspace: '/home/worker/workspace'
|
||||
|
||||
features:
|
||||
relengAPIProxy: true
|
||||
|
||||
env:
|
||||
MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_l10n.py'
|
||||
MOZHARNESS_CONFIG: 'single_locale/tc_{{platform}}.py'
|
||||
MOZHARNESS_ACTIONS: 'clone-locales list-locales setup repack summary'
|
||||
MOZHARNESS_OPTIONS: 'environment-config=single_locale/production.py branch-config=single_locale/{{project}}.py platform-config=single_locale/{{platform}}.py total-chunks=1 this-chunk=1'
|
||||
JOB_SCRIPT: 'taskcluster/scripts/builder/build-l10n.sh'
|
||||
MH_BRANCH: {{project}}
|
||||
MH_BUILD_POOL: taskcluster
|
||||
# image paths
|
||||
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
|
||||
NEED_XVFB: true
|
||||
|
||||
maxRunTime: 36000
|
||||
|
||||
command: ["/bin/bash", "bin/build.sh"]
|
||||
|
||||
extra:
|
||||
treeherderEnv:
|
||||
- production
|
||||
- staging
|
||||
treeherder:
|
||||
machine:
|
||||
# see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
|
||||
platform: {{platform}}
|
||||
@ -1,19 +0,0 @@
|
||||
$inherits:
|
||||
from: 'tasks/builds/firefox_l10n_base.yml'
|
||||
variables:
|
||||
build_name: 'linux32-l10n'
|
||||
platform: 'linux32'
|
||||
task:
|
||||
metadata:
|
||||
name: '[TC] Linux32 L10n'
|
||||
description: 'Linux32 L10n'
|
||||
|
||||
workerType: opt-linux32
|
||||
|
||||
extra:
|
||||
treeherder:
|
||||
groupSymbol: tc
|
||||
groupName: Submitted by taskcluster
|
||||
tier: 2
|
||||
symbol: L10n
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
$inherits:
|
||||
from: 'tasks/builds/firefox_l10n_base.yml'
|
||||
variables:
|
||||
build_name: 'linux64-l10n'
|
||||
platform: 'linux64'
|
||||
task:
|
||||
metadata:
|
||||
name: '[TC] Linux64 L10n'
|
||||
description: 'Linux64 L10n'
|
||||
|
||||
workerType: opt-linux64
|
||||
|
||||
extra:
|
||||
treeherder:
|
||||
groupSymbol: tc
|
||||
groupName: Submitted by taskcluster
|
||||
tier: 2
|
||||
symbol: L10n
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
# This is the "base" task which contains the common values all builds must
|
||||
# provide.
|
||||
---
|
||||
taskId: {{build_slugid}}
|
||||
|
||||
task:
|
||||
created: '{{now}}'
|
||||
deadline: '{{#from_now}}24 hours{{/from_now}}'
|
||||
metadata:
|
||||
source: '{{source}}'
|
||||
owner: mozilla-taskcluster-maintenance@mozilla.com
|
||||
|
||||
tags:
|
||||
createdForUser: {{owner}}
|
||||
|
||||
workerType: b2gbuild
|
||||
provisionerId: aws-provisioner-v1
|
||||
schedulerId: task-graph-scheduler
|
||||
|
||||
scopes:
|
||||
# Nearly all of our build tasks use tc-vcs so just include the scope across
|
||||
# the board.
|
||||
- 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
|
||||
|
||||
payload:
|
||||
# Two hours is long but covers edge cases (and matches bb based infra)
|
||||
maxRunTime: 7200
|
||||
|
||||
cache:
|
||||
level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
|
||||
|
||||
# All builds share a common artifact directory for ease of uploading.
|
||||
artifacts:
|
||||
'public/build':
|
||||
type: directory
|
||||
path: '/home/worker/workspace/build/upload/'
|
||||
expires: '{{#from_now}}1 year{{/from_now}}'
|
||||
|
||||
|
||||
env:
|
||||
# Common environment variables for checking out gecko
|
||||
GECKO_BASE_REPOSITORY: '{{base_repository}}'
|
||||
GECKO_HEAD_REPOSITORY: '{{head_repository}}'
|
||||
GECKO_HEAD_REV: '{{head_rev}}'
|
||||
GECKO_HEAD_REF: '{{head_ref}}'
|
||||
TOOLTOOL_REPO: 'https://git.mozilla.org/build/tooltool.git'
|
||||
TOOLTOOL_REV: 'master'
|
||||
MOZ_BUILD_DATE: '{{pushdate}}'
|
||||
MOZ_SCM_LEVEL: '{{level}}'
|
||||
|
||||
extra:
|
||||
# Don't set locations yet
|
||||
locations:
|
||||
build: null
|
||||
tests: null
|
||||
build_product: '{{build_product}}'
|
||||
build_name: '{{build_name}}'
|
||||
build_type: '{{build_type}}'
|
||||
index:
|
||||
rank: {{pushlog_id}}
|
||||
treeherder:
|
||||
groupSymbol: tc
|
||||
groupName: Submitted by taskcluster
|
||||
tier: 2
|
||||
symbol: L10n
|
||||
@ -120,28 +120,24 @@ class TestTryOptionSyntax(unittest.TestCase):
|
||||
self.assertEqual(tos.platforms, None)
|
||||
|
||||
def test_p_linux(self):
|
||||
"-p linux sets platforms=['linux', 'linux-l10n']"
|
||||
"-p linux sets platforms=['linux']"
|
||||
tos = TryOptionSyntax('try: -p linux', empty_graph)
|
||||
self.assertEqual(tos.platforms, ['linux', 'linux-l10n'])
|
||||
self.assertEqual(tos.platforms, ['linux'])
|
||||
|
||||
def test_p_linux_win32(self):
|
||||
"-p linux,win32 sets platforms=['linux', 'linux-l10n', 'win32']"
|
||||
"-p linux,win32 sets platforms=['linux', 'win32']"
|
||||
tos = TryOptionSyntax('try: -p linux,win32', empty_graph)
|
||||
self.assertEqual(sorted(tos.platforms), ['linux', 'linux-l10n', 'win32'])
|
||||
self.assertEqual(sorted(tos.platforms), ['linux', 'win32'])
|
||||
|
||||
def test_p_expands_ridealongs(self):
|
||||
"-p linux,linux64 includes the RIDEALONG_BUILDS"
|
||||
tos = TryOptionSyntax('try: -p linux,linux64', empty_graph)
|
||||
self.assertEqual(sorted(tos.platforms), [
|
||||
'linux',
|
||||
'linux-l10n',
|
||||
'linux64',
|
||||
'linux64-l10n',
|
||||
'sm-arm-sim',
|
||||
'sm-arm64-sim',
|
||||
'sm-compacting',
|
||||
'sm-nonunified',
|
||||
'sm-package',
|
||||
'sm-plain',
|
||||
'sm-rootanalysis',
|
||||
])
|
||||
|
||||
@ -120,18 +120,12 @@ UNITTEST_PLATFORM_PRETTY_NAMES = {
|
||||
# least build-ish things. Sort of. Anyway, these other things are implemented
|
||||
# as different "platforms".
|
||||
RIDEALONG_BUILDS = {
|
||||
'linux': [
|
||||
'linux-l10n',
|
||||
],
|
||||
'linux64': [
|
||||
'linux64-l10n',
|
||||
'sm-plain',
|
||||
'sm-nonunified',
|
||||
'sm-arm-sim',
|
||||
'sm-arm64-sim',
|
||||
'sm-compacting',
|
||||
'sm-rootanalysis',
|
||||
'sm-package',
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
linux.py
|
||||
@ -1,24 +0,0 @@
|
||||
import os
|
||||
|
||||
config = {
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"tools_repo": "https://hg.mozilla.org/build/tools",
|
||||
"mozconfig": "src/browser/config/mozconfigs/linux64/l10n-mozconfig",
|
||||
"bootstrap_env": {
|
||||
"NO_MERCURIAL_SETUP_CHECK": "1",
|
||||
"MOZ_OBJDIR": "obj-l10n",
|
||||
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
|
||||
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
|
||||
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
|
||||
"DIST": "%(abs_objdir)s",
|
||||
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
|
||||
"L10NBASEDIR": "../../l10n",
|
||||
"MOZ_MAKE_COMPLETE_MAR": "1",
|
||||
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
|
||||
},
|
||||
"upload_env": {
|
||||
'UPLOAD_HOST': 'localhost',
|
||||
'UPLOAD_PATH': '/home/worker/workspace/build/upload/',
|
||||
},
|
||||
"mozilla_dir": "src/",
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user