Bug 1272113: Packaging awsy in build job r=jmaher

MozReview-Commit-ID: 9VhsVIaaWqt --HG-- extra : rebase_source : ce4768033b0f3a912be9790b5ebe06fa6a2a0803
dothq · Mar 10, 2017 · 8d0339f · 8d0339f
1 parent 8b5af73
commit 8d0339f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/build/gen_test_packages_manifest.py b/build/gen_test_packages_manifest.py
@@ -18,6 +18,7 @@
     'mozbase',
     'web-platform',
     'talos',
+    'awsy',
     'gtest',
 ]
 
@@ -28,6 +29,7 @@
     'xpcshell',
     'web-platform',
     'talos',
+    'awsy',
 ]
 
 # These packages are not present for every build configuration.

diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
@@ -103,6 +103,7 @@
                 'mochitest/**',
                 'reftest/**',
                 'talos/**',
+                'awsy/**',
                 'web-platform/**',
                 'xpcshell/**',
             ],
@@ -374,6 +375,13 @@
             'pattern': 'talos/**',
         },
     ],
+    'awsy': [
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing',
+            'pattern': 'awsy/**',
+        },
+    ],
     'web-platform': [
         {
             'source': buildconfig.topsrcdir,

diff --git a/taskcluster/taskgraph/transforms/beetmover.py b/taskcluster/taskgraph/transforms/beetmover.py
@@ -25,6 +25,7 @@
     "target.mozinfo.json",
     "target.reftest.tests.zip",
     "target.talos.tests.zip",
+    "target.awsy.tests.zip",
     "target.test_packages.json",
     "target.txt",
     "target.web-platform.tests.zip",
@@ -74,6 +75,7 @@
     "target.mozinfo.json",
     "target.reftest.tests.zip",
     "target.talos.tests.zip",
+    "target.awsy.tests.zip",
     "target.test_packages.json",
     "target.txt",
     "target.web-platform.tests.zip",

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
@@ -134,6 +134,7 @@ TEST_PKGS := \
   mochitest \
   reftest \
   talos \
+  awsy \
   web-platform \
   xpcshell \
   $(NULL)

diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
@@ -94,6 +94,7 @@ MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
 REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
 WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.zip
 TALOS_PACKAGE = $(PKG_BASENAME).talos.tests.zip
+AWSY_PACKAGE = $(PKG_BASENAME).awsy.tests.zip
 GTEST_PACKAGE = $(PKG_BASENAME).gtest.tests.zip
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))

diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
@@ -406,6 +406,7 @@ UPLOAD_FILES= \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(XPC_TEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(MOCHITEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TALOS_PACKAGE)) \
+  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(AWSY_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \