Merge pull request #24 from rwood-moz/bug1156882

Bug 1156882 - Add support for emulator ics and kk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mozilla-download",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Download firefox/b2g-desktop runtimes",
   "license": "MIT",
   "main": "bin/mozilla-download",

src/extract.js

@@ -34,6 +34,7 @@ export default async function extract(options) {
     case 'dmg':
       await extractDmg(options);
       break;
+    case 'tar.gz':
     case 'tar.bz2':
       await extractTarball(options);
       break;

src/main.js

@@ -51,14 +51,15 @@ export default async function main(args=parser.parseArgs()) {
     debug('Artifact url', url);
     let path = await download(url, args);
     debug('Download to', path);
-    let extractOpts = { source: path, dest: args.dest, product: args.product };
+    let product = args.product;
+    let extractOpts = { source: path, dest: args.dest, product: product };
     if (args.fileSuffix) {
       let parts = args.fileSuffix.split('.');
       extractOpts.filetype = parts[parts.length - 1];
     } else {
       // They want the regular old build archive.
       let os = args.os;
-      extractOpts.filetype = buildinfo.archiveFiletype(os);
+      extractOpts.filetype = buildinfo.archiveFiletype(os, product);
     }
 
     await extract(extractOpts);

src/moz_build_info.js

@@ -1,7 +1,10 @@
 /**
  * @return filetype the filetype mozilla uses for build archives on a given os.
  */
-export function archiveFiletype(os) {
+export function archiveFiletype(os, product) {
+  if (product.indexOf('emulator') !== -1) {
+    return 'tar.gz';
+  }
   switch (os) {
     case 'mac64':
       return 'dmg';
@@ -20,7 +23,12 @@ export function archiveFiletype(os) {
  */
 export function archiveFileSuffix(product, os) {
   let ospart = (product === 'firefox' && os === 'mac64') ? 'mac' : os;
-  return `${ospart}.${archiveFiletype(os)}`;
+  let filetype = archiveFiletype(os, product);
+  if (product.indexOf('emulator') !== -1) {
+    // emulator doen't have os in filename
+    return filetype;
+  }
+  return `${ospart}.${filetype}`;
 }
 
 /**
@@ -60,6 +68,13 @@ export function buildname(options) {
     case 'mulet':
       result += '-mulet';
       break;
+    case 'emulator':
+    case 'emulator-ics':
+      result = 'emulator-ics';
+      break;
+    case 'emulator-kk':
+      result = 'emulator-kk';
+      break;
     default:
       throw new Error(`Unknown product ${options.product}`);
   }

test/detecturl_test.js

@@ -53,4 +53,21 @@ suite('detectURL', function() {
       assert.equal(error.message, 'Could not find appropriate artifact');
     }
   });
+
+  test('emulator-kk', async function() {
+    let options = {
+      product: 'emulator-kk',
+      os: 'linux-x86_64',
+      branch: 'mozilla-central'
+    };
+
+    let url = await detectURL(options);
+    assert.match(
+      url,
+      new RegExp(
+        '^https:\/\/queue\.taskcluster\.net\/v1\/task\/[A-Za-z0-9_\-]+\/' +
+        'artifacts\/public\/build\/emulator\.tar\.gz$'
+      )
+    );
+  });
 });