Bug 1246074 - add partials mozharness beetmover, custom tc artifact location, DONTBUILD NPOTB r=rail
authorJordan Lund <jlund@mozilla.com>
Thu, 18 Feb 2016 15:17:32 -0800
changeset 304333 3fa33fff66a397be9cf7192ece73523c2bb6cbee
parent 304332 04db0fd4362f4ca2e9c1d51700fbc93df04a3c6a
child 304334 645b7a96e0573d1c099b66fb95740e6bbdc82b85
push id9175
push userraliiev@mozilla.com
push dateThu, 03 Mar 2016 03:39:52 +0000
treeherdermozilla-aurora@0bee186afe5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1246074
milestone46.0a2
Bug 1246074 - add partials mozharness beetmover, custom tc artifact location, DONTBUILD NPOTB r=rail MozReview-Commit-ID: IcHL7zbSIyt
testing/mozharness/scripts/release/beet_mover.py
--- a/testing/mozharness/scripts/release/beet_mover.py
+++ b/testing/mozharness/scripts/release/beet_mover.py
@@ -62,16 +62,21 @@ CONFIG_OPTIONS = [
     [["--app-version"], {
         "dest": "app_version",
         "help": "numbered version based on gecko. e.g. '44.0'"
     }],
     [["--partial-version"], {
         "dest": "partial_version",
         "help": "the partial version the mar is based off of"
     }],
+    [["--artifact-subdir"], {
+        "dest": "artifact_subdir",
+        "default": 'build',
+        "help": "subdir location for taskcluster artifacts after public/ base.",
+    }],
     [["--build-num"], {
         "dest": "build_num",
         "help": "the release build identifier"
     }],
     [["--taskid"], {
         "dest": "taskid",
         "help": "taskcluster task id to download artifacts from",
     }],
@@ -96,17 +101,17 @@ class BeetMover(BaseScript, VirtualenvMi
                 'upload-bits',  # beets
             ],
             'require_config_file': False,
             # Default configuration
             'config': {
                 # base index url where to find taskcluster artifact based on taskid
                 # TODO - find out if we need to support taskcluster run number other than 0.
                 # e.g. maybe we could end up with artifacts in > 'run 0' in a re-trigger situation?
-                "artifact_base_url": 'https://queue.taskcluster.net/v1/task/{taskid}/runs/0/artifacts/public/build',
+                "artifact_base_url": 'https://queue.taskcluster.net/v1/task/{taskid}/runs/0/artifacts/public/{subdir}',
                 "virtualenv_modules": [
                     "boto",
                     "PyYAML",
                     "Jinja2",
                 ],
                 "virtualenv_path": "venv",
                 'buckets': {
                     'development': "mozilla-releng-beet-mover-dev",
@@ -162,17 +167,17 @@ class BeetMover(BaseScript, VirtualenvMi
             "locales": self.config['locales'],
             "version": self.config['version'],
             "app_version": self.config.get('app_version', ''),
             "partial_version": self.config.get('partial_version', ''),
             "build_num": self.config['build_num'],
             # mirror current release folder structure
             "s3_prefix": 'pub/{}/candidates'.format(self.config['product']),
             "artifact_base_url": self.config['artifact_base_url'].format(
-                    taskid=self.config['taskid']
+                    taskid=self.config['taskid'], subdir=self.config['artifact_sudbir']
             )
         }
         self.manifest = yaml.safe_load(template.render(**template_vars))
 
         self.log("manifest generated:")
         self.log(pprint.pformat(self.manifest['mapping']))
 
     def verify_bits(self):