Bug 1430984 - Drive-by: Move debian package jobs defaults to kind.yml. r=dustin
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 11 Jan 2018 07:24:11 +0900
changeset 454230 deb8dd9fb63c94b5056d7ad27bcda544cb9094bc
parent 454229 22353be3dbe32b966d9adf238e854e27a5623271
child 454231 b187975efd784232b16ef1163befa99837a2c90a
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1430984
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1430984 - Drive-by: Move debian package jobs defaults to kind.yml. r=dustin
taskcluster/ci/packages/kind.yml
taskcluster/taskgraph/transforms/job/debian_package.py
--- a/taskcluster/ci/packages/kind.yml
+++ b/taskcluster/ci/packages/kind.yml
@@ -13,16 +13,19 @@ job-defaults:
   treeherder:
     kind: build
     platform: packages/opt
     tier: 1
   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
   worker:
     max-run-time: 1800
   run-on-projects: []
+  run:
+    dist: wheezy
+    snapshot: 20171210T214726Z
 
 jobs:
   deb7-python:
     description: "Python backport for Debian wheezy"
     treeherder:
       symbol: Deb7(python)
     run:
       using: debian-package
--- a/taskcluster/taskgraph/transforms/job/debian_package.py
+++ b/taskcluster/taskgraph/transforms/job/debian_package.py
@@ -26,40 +26,38 @@ SOURCE_PACKAGE_RE = re.compile('.*(?=[-_
 source_definition = {
     Required('url'): basestring,
     Required('sha256'): basestring,
 }
 
 run_schema = Schema({
     Required('using'): 'debian-package',
     # Debian distribution
-    Optional('dist'): basestring,
+    Required('dist'): basestring,
 
     # Date of the snapshot (from snapshot.debian.org) to use, in the format
     # YYYYMMDDTHHMMSSZ. The same date is used for the base docker-image name
     # (only the YYYYMMDD part).
-    Optional('snapshot'): basestring,
+    Required('snapshot'): basestring,
 
     # URL/SHA256 of a source file to build, which can either be a source
     # control (.dsc), or a tarball.
     Required(Any('dsc', 'tarball')): source_definition,
 
     # Patch to apply to the extracted source.
     Optional('patch'): basestring,
 
     # Command to run before dpkg-buildpackage.
     Optional('pre-build-command'): basestring,
 })
 
 
 @run_job_using("docker-worker", "debian-package", schema=run_schema)
 def docker_worker_debian_package(config, job, taskdesc):
     run = job['run']
-    run.setdefault('dist', 'wheezy')
-    run.setdefault('snapshot', '20171210T214726Z')
 
     worker = taskdesc['worker']
     worker['artifacts'] = []
     worker['docker-image'] = 'debian:{dist}-{date}'.format(
         dist=run['dist'],
         date=run['snapshot'][:8])
 
     add_public_artifacts(config, job, taskdesc, path='/tmp/artifacts')