Backed out changeset d10f5ccd882b, for Nightly bustage from Bug 1359965 c#29
authorJustin Wood <Callek@gmail.com>
Thu, 25 May 2017 09:08:54 -0400
changeset 360656 23a341e9b53d04f80ea6a66ced2d72cdc17afffb
parent 360655 ab0dcc11686cfaa56aab1c7b879fecbe8c1f0d0c
child 360690 ad8680143ff64a95c3e6145a26f236462bd7d04d
push id90713
push userryanvm@gmail.com
push dateThu, 25 May 2017 20:36:06 +0000
treeherdermozilla-inbound@348e3ebeb9ac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1359965
milestone55.0a1
backs outd10f5ccd882b965fcad39914f7c3c930d1301a41
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
Backed out changeset d10f5ccd882b, for Nightly bustage from Bug 1359965 c#29 MozReview-Commit-ID: 6ddN0Y55Bsk
python/mozbuild/mozbuild/action/test_archive.py
taskcluster/taskgraph/transforms/beetmover.py
taskcluster/taskgraph/transforms/beetmover_repackage.py
testing/testsuite-targets.mk
toolkit/mozapps/installer/package-name.mk
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -15,17 +15,16 @@ import itertools
 import os
 import sys
 import time
 
 from manifestparser import TestManifest
 from reftest import ReftestManifest
 
 from mozbuild.util import ensureParentDir
-from mozpack.archive import create_tar_gz_from_files
 from mozpack.copier import FileRegistry
 from mozpack.files import ExistingFile, FileFinder
 from mozpack.manifests import InstallManifest
 from mozpack.mozjar import JarWriter
 import mozpack.path as mozpath
 
 import buildconfig
 
@@ -610,41 +609,32 @@ def find_manifest_dirs(topsrcdir, manife
 def main(argv):
     parser = argparse.ArgumentParser(
         description='Produce test archives')
     parser.add_argument('archive', help='Which archive to generate')
     parser.add_argument('outputfile', help='File to write output to')
 
     args = parser.parse_args(argv)
 
-    out_file = args.outputfile
-    if not out_file.endswith(('.tar.gz', '.zip')):
-        raise Exception('expected tar.gz or zip output file')
+    if not args.outputfile.endswith('.zip'):
+        raise Exception('expected zip output file')
 
     file_count = 0
     t_start = time.time()
-    ensureParentDir(out_file)
-    res = find_files(args.archive)
-    with open(out_file, 'wb') as fh:
+    ensureParentDir(args.outputfile)
+    with open(args.outputfile, 'wb') as fh:
         # Experimentation revealed that level 5 is significantly faster and has
         # marginally larger sizes than higher values and is the sweet spot
         # for optimal compression. Read the detailed commit message that
         # introduced this for raw numbers.
-        if out_file.endswith('.tar.gz'):
-            files = dict(res)
-            create_tar_gz_from_files(fh, files, compresslevel=5)
-            file_count = len(files)
-        elif out_file.endswith('.zip'):
-            with JarWriter(fileobj=fh, optimize=False, compress_level=5) as writer:
-                for p, f in res:
-                    writer.add(p.encode('utf-8'), f.read(), mode=f.mode,
-                               skip_duplicates=True)
-                    file_count += 1
-        else:
-            raise Exception('unhandled file extension: %s' % out_file)
+        with JarWriter(fileobj=fh, optimize=False, compress_level=5) as writer:
+            res = find_files(args.archive)
+            for p, f in res:
+                writer.add(p.encode('utf-8'), f.read(), mode=f.mode, skip_duplicates=True)
+                file_count += 1
 
     duration = time.time() - t_start
     zip_size = os.path.getsize(args.outputfile)
     basename = os.path.basename(args.outputfile)
     print('Wrote %d files in %d bytes to %s in %.2fs' % (
           file_count, zip_size, basename, duration))
 
 
--- a/taskcluster/taskgraph/transforms/beetmover.py
+++ b/taskcluster/taskgraph/transforms/beetmover.py
@@ -28,17 +28,17 @@ from voluptuous import Any, Required, Op
     "target.json",
     "target.mochitest.tests.zip",
     "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.tar.gz",
+    "target.web-platform.tests.zip",
     "target.xpcshell.tests.zip",
     "target_info.txt",
     "target.jsshell.zip",
     "mozharness.zip",
     "target.langpack.xpi",
     "host/bin/mar",
     "host/bin/mbsdiff",
 ]
@@ -59,17 +59,17 @@ from voluptuous import Any, Required, Op
     "en-US/target.json",
     "en-US/target.mochitest.tests.zip",
     "en-US/target.mozinfo.json",
     "en-US/target.reftest.tests.zip",
     "en-US/target.talos.tests.zip",
     "en-US/target.awsy.tests.zip",
     "en-US/target.test_packages.json",
     "en-US/target.txt",
-    "en-US/target.web-platform.tests.tar.gz",
+    "en-US/target.web-platform.tests.zip",
     "en-US/target.xpcshell.tests.zip",
     "en-US/target_info.txt",
     "en-US/bouncer.apk",
     "en-US/mozharness.zip",
     "en-US/robocop.apk",
     "en-US/target.jsshell.zip",
 ]
 _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI = [
@@ -79,17 +79,17 @@ from voluptuous import Any, Required, Op
     "target.json",
     "target.mochitest.tests.zip",
     "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.tar.gz",
+    "target.web-platform.tests.zip",
     "target.xpcshell.tests.zip",
     "target_info.txt",
     "bouncer.apk",
     "mozharness.zip",
     "robocop.apk",
     "target.jsshell.zip",
 ]
 _MOBILE_UPSTREAM_ARTIFACTS_SIGNED_EN_US = [
--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -30,17 +30,17 @@ logger = logging.getLogger(__name__)
     "target.json",
     "target.mochitest.tests.zip",
     "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.tar.gz",
+    "target.web-platform.tests.zip",
     "target.xpcshell.tests.zip",
     "target_info.txt",
     "target.jsshell.zip",
     "mozharness.zip",
     "target.langpack.xpi",
     "host/bin/mar",
     "host/bin/mbsdiff",
 ]
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -114,61 +114,56 @@ stage-all: \
 ifdef MOZ_WEBRTC
 stage-all: stage-steeplechase
 endif
 
 ifdef COMPILE_ENVIRONMENT
 stage-all: stage-cppunittests
 endif
 
-TEST_PKGS_ZIP := \
+TEST_PKGS := \
   common \
   cppunittest \
   mochitest \
   reftest \
   talos \
   awsy \
+  web-platform \
   xpcshell \
   $(NULL)
 
-TEST_PKGS_TARGZ := \
-  web-platform \
-  $(NULL)
-
 ifdef LINK_GTEST_DURING_COMPILE
 stage-all: stage-gtest
-TEST_PKGS_ZIP += gtest
+TEST_PKGS += gtest
 endif
 
-PKG_ARG = --$(1) '$(PKG_BASENAME).$(1).tests.$(2)'
+PKG_ARG = --$(1) '$(PKG_BASENAME).$(1).tests.zip'
 
 test-packages-manifest:
 	@rm -f $(MOZ_TEST_PACKAGES_FILE)
 	$(NSINSTALL) -D $(dir $(MOZ_TEST_PACKAGES_FILE))
 	$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py \
       --jsshell $(JSSHELL_NAME) \
       --dest-file '$(MOZ_TEST_PACKAGES_FILE)' \
-      $(call PKG_ARG,common,zip) \
-      $(foreach pkg,$(TEST_PKGS_ZIP),$(call PKG_ARG,$(pkg),zip)) \
-      $(foreach pkg,$(TEST_PKGS_TARGZ),$(call PKG_ARG,$(pkg),tar.gz))
+      $(call PKG_ARG,common) \
+      $(foreach pkg,$(TEST_PKGS),$(call PKG_ARG,$(pkg)))
 
 package-tests-prepare-dest:
 	@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 
 define package_archive
 package-tests-$(1): stage-all package-tests-prepare-dest
 	$$(call py_action,test_archive, \
 		$(1) \
-		'$$(abspath $$(DIST))/$$(PKG_PATH)/$$(PKG_BASENAME).$(1).tests.$(2)')
+		'$$(abspath $$(DIST))/$$(PKG_PATH)/$$(PKG_BASENAME).$(1).tests.zip')
 package-tests: package-tests-$(1)
 endef
 
-$(foreach name,$(TEST_PKGS_ZIP),$(eval $(call package_archive,$(name),zip)))
-$(foreach name,$(TEST_PKGS_TARGZ),$(eval $(call package_archive,$(name),tar.gz)))
+$(foreach name,$(TEST_PKGS),$(eval $(call package_archive,$(name))))
 
 ifeq ($(MOZ_BUILD_APP),mobile/android)
 stage-all: stage-android
 stage-all: stage-instrumentation-tests
 endif
 
 # Prepare _tests before any of the other staging/packaging steps.
 # make-stage-dir is a prerequisite to all the stage-* targets in testsuite-targets.mk.
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -87,17 +87,17 @@ CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_B
 MOZHARNESS_PACKAGE = mozharness.zip
 
 # Test package naming
 TEST_PACKAGE = $(PKG_BASENAME).common.tests.zip
 CPP_TEST_PACKAGE = $(PKG_BASENAME).cppunittest.tests.zip
 XPC_TEST_PACKAGE = $(PKG_BASENAME).xpcshell.tests.zip
 MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
 REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
-WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.tar.gz
+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))
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
 else
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)