Bug 1519374 - Use mobile-X-b-fenix in lieu of gecko-focus
parent
6e31927cc7
commit
d621630ab8
|
@ -24,8 +24,8 @@ tasks:
|
|||
else: mobile-1-decision
|
||||
build_worker_type:
|
||||
$if: event.repository.html_url == 'https://github.com/mozilla-mobile/fenix'
|
||||
then: gecko-focus
|
||||
else: android-components-g
|
||||
then: mobile-3-b-fenix
|
||||
else: mobile-1-b-fenix
|
||||
in:
|
||||
taskId: ${decision_task_id}
|
||||
taskGroupId: ${decision_task_id} # Must be explicit because of Chain of Trust
|
||||
|
@ -65,12 +65,13 @@ tasks:
|
|||
taskclusterProxy: true
|
||||
chainOfTrust: true
|
||||
env:
|
||||
TASK_ID: ${decision_task_id}
|
||||
SCHEDULER_ID: ${scheduler_id}
|
||||
MOBILE_HEAD_REPOSITORY: ${repository}
|
||||
BUILD_WORKER_TYPE: ${build_worker_type}
|
||||
MOBILE_HEAD_BRANCH: ${event.release.target_commitish}
|
||||
MOBILE_HEAD_REPOSITORY: ${repository}
|
||||
MOBILE_HEAD_REV: ${event.release.tag_name}
|
||||
MOBILE_TRIGGERED_BY: ${event.sender.login}
|
||||
SCHEDULER_ID: ${scheduler_id}
|
||||
TASK_ID: ${decision_task_id}
|
||||
command:
|
||||
- /bin/bash
|
||||
- --login
|
||||
|
|
|
@ -24,7 +24,8 @@ BUILDER = lib.tasks.TaskBuilder(
|
|||
task_id=TASK_ID,
|
||||
owner="fenix-eng-notifications@mozilla.com",
|
||||
source='{}/raw/{}/.taskcluster.yml'.format(GITHUB_HTTP_REPOSITORY, HEAD_REV),
|
||||
scheduler_id=SCHEDULER_ID
|
||||
scheduler_id=SCHEDULER_ID,
|
||||
build_worker_type=os.environ.get('BUILD_WORKER_TYPE'),
|
||||
)
|
||||
|
||||
|
||||
|
@ -50,7 +51,6 @@ def generate_build_task(apks, is_staging):
|
|||
"taskclusterProxy": True
|
||||
},
|
||||
artifacts=artifacts,
|
||||
worker_type='android-components-g' if is_staging else 'gecko-focus',
|
||||
scopes=[
|
||||
"secrets:get:{}".format(sentry_secret)
|
||||
]
|
||||
|
|
|
@ -8,19 +8,20 @@ import taskcluster
|
|||
|
||||
|
||||
class TaskBuilder(object):
|
||||
def __init__(self, task_id, owner, source, scheduler_id):
|
||||
def __init__(self, task_id, owner, source, scheduler_id, build_worker_type):
|
||||
self.task_id = task_id
|
||||
self.owner = owner
|
||||
self.source = source
|
||||
self.scheduler_id = scheduler_id
|
||||
self.build_worker_type = build_worker_type
|
||||
|
||||
def build_task(self, name, description, command, artifacts, features, worker_type, scopes=[]):
|
||||
def build_task(self, name, description, command, artifacts, features, scopes=[]):
|
||||
created = datetime.datetime.now()
|
||||
expires = taskcluster.fromNow('1 year')
|
||||
deadline = taskcluster.fromNow('1 day')
|
||||
|
||||
return {
|
||||
"workerType": worker_type,
|
||||
"workerType": self.build_worker_type,
|
||||
"taskGroupId": self.task_id,
|
||||
"schedulerId": self.scheduler_id,
|
||||
"expires": taskcluster.stringDate(expires),
|
||||
|
|
Loading…
Reference in New Issue