mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 1286075: simplify toolchain build tasks; r=glandium
This removes the use of inheritance for these tasks, incorporating some things that used to be inherited and dropping others. In particular, * drops index routes * drops the unused DISABLE_MOZHARNESS * sets tier explicitly to 1 * uses tooltool for both, even if gcc ignores it * drops the unused secrets scope MozReview-Commit-ID: GaMUpHa7PWN --HG-- extra : rebase_source : a2bcef79cdda65630762d322e0c1897ca0f2cd3d
This commit is contained in:
parent
24cb337d4d
commit
8ca6793163
@ -1,8 +1,11 @@
|
||||
$inherits:
|
||||
from: 'tasks/builds/firefox_docker_base.yml'
|
||||
from: 'tasks/build.yml'
|
||||
variables:
|
||||
build_product: firefox
|
||||
build_name: 'linux64-clang'
|
||||
build_type: 'opt'
|
||||
|
||||
docker-image: desktop-build
|
||||
task:
|
||||
metadata:
|
||||
name: '[TC] Clang'
|
||||
@ -10,19 +13,22 @@ task:
|
||||
|
||||
workerType: 'gecko-{{level}}-b-linux'
|
||||
|
||||
routes:
|
||||
- 'index.buildbot.branches.{{project}}.clang'
|
||||
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.clang'
|
||||
|
||||
scopes:
|
||||
- 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
|
||||
- 'docker-worker:cache:tooltool-cache'
|
||||
|
||||
payload:
|
||||
image:
|
||||
type: 'task-image'
|
||||
path: 'public/image.tar'
|
||||
taskId:
|
||||
task-reference: "<docker-image>"
|
||||
|
||||
cache:
|
||||
level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
|
||||
tooltool-cache: '/home/worker/tooltool-cache'
|
||||
|
||||
env:
|
||||
MOZHARNESS_DISABLE: 'true'
|
||||
TOOLS_DISABLE: 'true'
|
||||
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
|
||||
|
||||
@ -31,9 +37,9 @@ task:
|
||||
command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/misc/build-clang-linux.sh" ]
|
||||
|
||||
artifacts:
|
||||
'public/clang.tar.xz':
|
||||
type: file
|
||||
path: '/home/worker/workspace/artifacts/clang.tar.xz'
|
||||
'public':
|
||||
type: directory
|
||||
path: '/home/worker/workspace/artifacts/'
|
||||
expires:
|
||||
relative-datestamp: "1 year"
|
||||
|
||||
@ -45,6 +51,7 @@ task:
|
||||
groupSymbol: Cc
|
||||
groupName: Compilers, submitted by taskcluster
|
||||
symbol: Clang
|
||||
tier: 1
|
||||
machine:
|
||||
platform: linux64
|
||||
locations:
|
||||
|
@ -1,8 +1,11 @@
|
||||
$inherits:
|
||||
from: 'tasks/builds/firefox_docker_base.yml'
|
||||
from: 'tasks/build.yml'
|
||||
variables:
|
||||
build_product: firefox
|
||||
build_name: 'linux64-gcc'
|
||||
build_type: 'opt'
|
||||
|
||||
docker-image: desktop-build
|
||||
task:
|
||||
metadata:
|
||||
name: '[TC] GCC'
|
||||
@ -10,23 +13,33 @@ task:
|
||||
|
||||
workerType: 'gecko-{{level}}-b-linux'
|
||||
|
||||
routes:
|
||||
- 'index.buildbot.branches.{{project}}.gcc'
|
||||
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.gcc'
|
||||
scopes:
|
||||
- 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
|
||||
- 'docker-worker:cache:tooltool-cache'
|
||||
|
||||
payload:
|
||||
image:
|
||||
type: 'task-image'
|
||||
path: 'public/image.tar'
|
||||
taskId:
|
||||
task-reference: "<docker-image>"
|
||||
|
||||
cache:
|
||||
level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
|
||||
tooltool-cache: '/home/worker/tooltool-cache'
|
||||
|
||||
env:
|
||||
MOZHARNESS_DISABLE: 'true'
|
||||
TOOLS_DISABLE: 'true'
|
||||
TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
|
||||
|
||||
maxRunTime: 36000
|
||||
|
||||
command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/misc/build-gcc-linux.sh" ]
|
||||
|
||||
artifacts:
|
||||
'public/gcc.tar.xz':
|
||||
type: file
|
||||
path: '/home/worker/workspace/artifacts/gcc.tar.xz'
|
||||
'public':
|
||||
type: directory
|
||||
path: '/home/worker/workspace/artifacts/'
|
||||
expires:
|
||||
relative-datestamp: "1 year"
|
||||
|
||||
@ -38,6 +51,7 @@ task:
|
||||
groupSymbol: Cc
|
||||
groupName: Compilers, submitted by taskcluster
|
||||
symbol: GCC
|
||||
tier: 1
|
||||
machine:
|
||||
platform: linux64
|
||||
locations:
|
||||
|
Loading…
Reference in New Issue
Block a user