Bug 1277881 - Remove all gecko.v1 routes; r?dustin
MozReview-Commit-ID: HyZO2sKFuJD
--- a/taskcluster/ci/b2g-device/kind.yml
+++ b/taskcluster/ci/b2g-device/kind.yml
@@ -39,60 +39,56 @@ job-defaults:
jobs:
aries-eng/opt:
description: "B2G Aries Opt"
index:
product: b2g
job-name:
- gecko-v1: aries-eng.opt
gecko-v2: aries-eng-opt
treeherder:
platform: b2g-device-image/opt
symbol: Aries(Be)
run:
using: phone-builder
target: aries
aries-eng/debug:
description: "B2G Aries Debug"
index:
product: b2g
job-name:
- gecko-v1: aries.debug
gecko-v2: aries-debug
treeherder:
platform: b2g-device-image/debug
symbol: Aries(Bd)
run:
using: phone-builder
target: aries
debug: true
nexus-5l-eng/opt:
description: "B2G Nexus 5-L Opt"
index:
product: b2g
job-name:
- gecko-v1: nexus-5-l-eng.opt
gecko-v2: nexus-5-l-eng-opt
treeherder:
platform: b2g-device-image/opt
symbol: Nexus 5-L(Be)
run:
using: phone-builder
target: nexus-5-l
nexus-5l-eng/debug:
description: "B2G Nexus 5-L Debug"
index:
product: b2g
job-name:
- gecko-v1: nexus-5-l-eng.debug
gecko-v2: nexus-5-l-eng-debug
treeherder:
platform: b2g-device-image/debug
symbol: Nexus 5-L(Bd)
run:
using: phone-builder
target: nexus-5-l
debug: true
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -1,15 +1,14 @@
android-api-15/debug:
description: "Android 4.0 API15+ Debug"
index:
product: mobile
job-name:
buildbot: android-api-15-debug
- gecko-v1: android-api-15.debug
gecko-v2: android-api-15-debug
treeherder:
platform: android-4-0-armv7-api15/debug
symbol: tc(B)
worker-type: aws-provisioner-v1/android-api-15
worker:
implementation: docker-worker
max-run-time: 7200
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -49,17 +49,16 @@ linux64/pgo:
need-xvfb: true
linux64/debug:
description: "Linux64 Debug"
index:
product: firefox
job-name:
buildbot: linux64-debug
- gecko-v1: linux64.debug
gecko-v2: linux64-debug
treeherder:
platform: linux64/debug
symbol: tc(B)
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
implementation: docker-worker
max-run-time: 36000
--- a/taskcluster/ci/build/mulet.yml
+++ b/taskcluster/ci/build/mulet.yml
@@ -1,15 +1,14 @@
linux64-mulet/debug:
description: "Linux64 Mulet Debug"
index:
product: b2g
job-name:
buildbot: linux64-mulet
- gecko-v1: mulet.dbg
gecko-v2: mulet-dbg
treeherder:
platform: mulet-linux64/debug # See bug 1286086
symbol: B
tier: 3
worker-type: aws-provisioner-v1/mulet-debug
worker:
implementation: docker-worker
@@ -20,17 +19,16 @@ linux64-mulet/debug:
tooltool-manifest: b2g/dev/config/tooltool-manifests/linux64/releng.manifest
linux64-mulet/opt:
description: "Linux64 Mulet Opt"
index:
product: b2g
job-name:
buildbot: linux64-mulet
- gecko-v1: mulet.opt
gecko-v2: mulet-opt
treeherder:
platform: mulet-linux64/opt # ?!?%
symbol: B
tier: 3
worker-type: aws-provisioner-v1/mulet-opt
worker:
implementation: docker-worker
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -20,17 +20,16 @@ job-defaults:
docker-image: {in-tree: desktop-build}
jobs:
linux64-shell-haz/debug:
description: "JS Shell Hazard Analysis Linux"
index:
product: firefox
job-name:
- gecko-v1: shell-haz.debug
gecko-v2: shell-haz-debug
treeherder:
platform: linux64/debug
symbol: SM-tc(H)
run:
using: hazard
tooltool-manifest: "browser/config/tooltool-manifests/linux64/hazard.manifest"
command: >
@@ -42,17 +41,16 @@ jobs:
- js/public/**
- js/src/**
linux64-haz/debug:
description: "Browser Hazard Analysis Linux"
index:
product: firefox
job-name:
- gecko-v1: browser-haz.debug
gecko-v2: browser-haz-debug
treeherder:
platform: linux64/debug
symbol: tc(H)
run:
using: hazard
tooltool-manifest: "browser/config/tooltool-manifests/linux64/hazard.manifest"
mozconfig: "browser/config/mozconfigs/linux64/hazards"
@@ -62,17 +60,16 @@ jobs:
&& ./build-haz-linux.sh --project browser $HOME/workspace
linux64-mulet-haz/debug:
description: "Mulet Hazard Analysis Linux"
index:
product: b2g
job-name:
buildbot: linux64-haz-mulet
- gecko-v1: mulet-haz.debug
gecko-v2: mulet-haz-debug
treeherder:
platform: mulet-linux64/opt
symbol: tc(H)
tier: 3
# don't run anywhere by default, but still available via try: -b d -p linux64-mulet-haz
run-on-projects: []
worker:
--- a/taskcluster/ci/nightly-fennec/docker_build.yml
+++ b/taskcluster/ci/nightly-fennec/docker_build.yml
@@ -1,19 +1,15 @@
$inherits:
from: 'build.yml'
task:
workerType: b2gbuild
- routes:
- - 'index.gecko.v1.{{project}}.revision.linux.{{head_rev}}.{{build_name}}.{{build_type}}'
- - 'index.gecko.v1.{{project}}.latest.linux.{{build_name}}.{{build_type}}'
-
scopes:
# docker build tasks use tc-vcs so include the scope.
- 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
payload:
cache:
level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
--- a/taskcluster/ci/spidermonkey/kind.yml
+++ b/taskcluster/ci/spidermonkey/kind.yml
@@ -31,17 +31,16 @@ job-defaults:
- js/src/**
jobs:
sm-package/opt:
description: "Spidermonkey source package and test"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-package.opt
gecko-v2: sm-package-opt
treeherder:
symbol: SM-tc(pkg)
run:
using: spidermonkey-package
spidermonkey-variant: plain
run-on-projects:
- integration
@@ -69,17 +68,16 @@ jobs:
- toolkit/mozapps/installer/package-name.mk
- toolkit/mozapps/installer/upload-files.mk
sm-plain/debug:
description: "Spidermonkey Plain"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-plaindebug.debug
gecko-v2: sm-plaindebug-debug
treeherder:
platform: linux64/debug
symbol: SM-tc(p)
run:
spidermonkey-variant: plaindebug
run-on-projects:
- integration
@@ -97,124 +95,116 @@ jobs:
- integration
- release
sm-arm-sim/debug:
description: "Spidermonkey ARM sim"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-arm-sim.debug
gecko-v2: sm-arm-sim-debug
treeherder:
symbol: SM-tc(arm)
run:
spidermonkey-variant: arm-sim
run-on-projects:
- integration
- release
sm-arm64-sim/debug:
description: "Spidermonkey ARM64 sim"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-arm64-sim.debug
gecko-v2: sm-arm64-sim-debug
treeherder:
symbol: SM-tc(arm64)
run:
spidermonkey-variant: arm64-sim
run-on-projects:
- integration
- release
sm-asan/opt:
description: "Spidermonkey Address Sanitizer"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-asan.opt
gecko-v2: sm-asan-opt
treeherder:
symbol: SM-tc(asan)
run:
spidermonkey-variant: asan
tooltool-manifest: browser/config/tooltool-manifests/linux64/asan.manifest
run-on-projects:
- integration
- release
sm-compacting/debug:
description: "Spidermonkey Compacting"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-compacting.debug
gecko-v2: sm-compacting-debug
treeherder:
symbol: SM-tc(cgc)
run:
spidermonkey-variant: compacting
run-on-projects:
- integration
- release
sm-msan/opt:
description: "Spidermonkey Memory Sanitizer"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-msan.opt
gecko-v2: sm-msan-opt
treeherder:
symbol: SM-tc(msan)
run:
spidermonkey-variant: msan
tooltool-manifest: browser/config/tooltool-manifests/linux64/msan.manifest
run-on-projects:
- integration
- release
sm-tsan/opt:
description: "Spidermonkey Thread Sanitizer"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-tsan.opt
gecko-v2: sm-tsan-opt
treeherder:
symbol: SM-tc(tsan)
tier: 3
run-on-projects: []
run:
spidermonkey-variant: tsan
tooltool-manifest: browser/config/tooltool-manifests/linux64/tsan.manifest
sm-rootanalysis/debug:
description: "Spidermonkey Root Analysis"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-rootanalysis.debug
gecko-v2: sm-rootanalysis-debug
treeherder:
symbol: SM-tc(r)
run:
spidermonkey-variant: rootanalysis
run-on-projects:
- integration
- release
sm-nonunified/debug:
description: "Spidermonkey Non-Unified Debug"
index:
job-name:
buildbot: sm-plain
- gecko-v1: sm-nonunified.debug
gecko-v2: sm-nonunified-debug
treeherder:
platform: linux64/debug
symbol: SM-tc(nu)
run:
spidermonkey-variant: nonunified
run-on-projects:
- integration
--- a/taskcluster/taskgraph/transforms/job/mulet.py
+++ b/taskcluster/taskgraph/transforms/job/mulet.py
@@ -91,19 +91,15 @@ def docker_worker_mulet_simulator(config
# assumes the builder image (which contains the gecko checkout command)
taskdesc['worker']['docker-image'] = {"in-tree": "builder"}
worker['taskcluster-proxy'] = False
docker_worker_add_public_artifacts(config, job, taskdesc)
docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
- taskdesc.setdefault('routes', []).extend([
- 'index.gecko.v1.{project}.latest.simulator.opt'.format(**config.params),
- ])
-
shell_command = run['shell-command'].format(**config.params)
worker['command'] = [
"/bin/bash",
"-exc",
{'task-reference': shell_command},
]
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -95,17 +95,16 @@ task_description_schema = Schema({
basestring,
# otherwise, give separate names for each of the legacy index
# routes; if a name is omitted, no corresponding route will be
# created.
{
# the name as it appears in buildbot routes
Optional('buildbot'): basestring,
- Optional('gecko-v1'): basestring,
Required('gecko-v2'): basestring,
}
),
},
# The `run_on_projects` attribute, defaulting to "all". This dictates the
# projects on which this task should be included in the target task set.
# See the attributes documentation for details.
@@ -251,21 +250,16 @@ GROUP_NAMES = {
}
UNKNOWN_GROUP_NAME = "Treeherder group {} has no name; add it to " + __file__
BUILDBOT_ROUTE_TEMPLATES = [
"index.buildbot.branches.{project}.{job-name-buildbot}",
"index.buildbot.revisions.{head_rev}.{project}.{job-name-buildbot}",
]
-V1_ROUTE_TEMPLATES = [
- "index.gecko.v1.{project}.latest.linux.{job-name-gecko-v1}",
- "index.gecko.v1.{project}.revision.linux.{head_rev}.{job-name-gecko-v1}",
-]
-
V2_ROUTE_TEMPLATES = [
"index.gecko.v2.{project}.latest.{product}.{job-name-gecko-v2}",
"index.gecko.v2.{project}.pushdate.{pushdate_long}.{product}.{job-name-gecko-v2}",
"index.gecko.v2.{project}.revision.{head_rev}.{product}.{job-name-gecko-v2}",
]
# the roots of the treeherder routes, keyed by treeherder environment
TREEHERDER_ROUTE_ROOTS = {
@@ -403,17 +397,16 @@ def add_index_routes(config, tasks):
continue
job_name = index['job-name']
# unpack the v2 name to v1 and buildbot names
if isinstance(job_name, basestring):
base_name, type_name = job_name.rsplit('-', 1)
job_name = {
'buildbot': base_name,
- 'gecko-v1': '{}.{}'.format(base_name, type_name),
'gecko-v2': '{}-{}'.format(base_name, type_name),
}
if job_name['gecko-v2'] not in JOB_NAME_WHITELIST:
raise Exception(JOB_NAME_WHITELIST_ERROR.format(job_name['gecko-v2']))
subs = config.params.copy()
for n in job_name:
@@ -421,19 +414,16 @@ def add_index_routes(config, tasks):
subs['pushdate_long'] = time.strftime(
"%Y.%m.%d.%Y%m%d%H%M%S",
time.gmtime(config.params['pushdate']))
subs['product'] = index['product']
if 'buildbot' in job_name:
for tpl in BUILDBOT_ROUTE_TEMPLATES:
routes.append(tpl.format(**subs))
- if 'gecko-v1' in job_name:
- for tpl in V1_ROUTE_TEMPLATES:
- routes.append(tpl.format(**subs))
if 'gecko-v2' in job_name:
for tpl in V2_ROUTE_TEMPLATES:
routes.append(tpl.format(**subs))
# rank is zero for non-tier-1 tasks and based on pushid for others;
# this sorts tier-{2,3} builds below tier-1 in the index
tier = task.get('treeherder', {}).get('tier', 3)
task.setdefault('extra', {})['index'] = {