Bug 1517298 - Add comm mozharness configs to mozharness test archive. r=firefox-build-system-reviewers,mshal
authorRob Lemley <rob@thunderbird.net>
Tue, 22 Jan 2019 20:15:36 +0000
changeset 515353 8431bedf934c736cea962c692006ddcf0901eab0
parent 515352 6ccd730174ffc3433f50aad28b540da0f58f9357
child 515354 8456feb780f7a4b44dc879268e6390aa4f4ce0b1
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, mshal
bugs1517298
milestone66.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 1517298 - Add comm mozharness configs to mozharness test archive. r=firefox-build-system-reviewers,mshal First step in moving Thunderbird mozharness unittest configurations out of M-C. This merges the comm/mozharness directory into the mozharness test archive's mozharness/configs/ so that the comm config files can be accessed later by desktop_unittest.py. This inclusion is conditional and will only happen when building Thunderbird; there are no changes to the mozharness.zip file when building Firefox. Differential Revision: https://phabricator.services.mozilla.com/D16374
python/mozbuild/mozbuild/action/test_archive.py
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -586,16 +586,27 @@ if buildconfig.substs.get('MOZ_ASAN') an
         'source': buildconfig.topobjdir,
         'base': 'dist/bin',
         'pattern': os.path.basename(buildconfig.substs['MOZ_CLANG_RT_ASAN_LIB_PATH']),
         'dest': 'bin'
     }
     ARCHIVE_FILES['common'].append(asan_dll)
 
 
+if buildconfig.substs.get('commtopsrcdir'):
+    commtopsrcdir = buildconfig.substs.get('commtopsrcdir')
+    mozharness_comm = {
+        'source': commtopsrcdir,
+        'base': 'mozharness',
+        'pattern': '**',
+        'dest': 'mozharness/configs'
+    }
+    ARCHIVE_FILES['mozharness'].append(mozharness_comm)
+
+
 # "common" is our catch all archive and it ignores things from other archives.
 # Verify nothing sneaks into ARCHIVE_FILES without a corresponding exclusion
 # rule in the "common" archive.
 for k, v in ARCHIVE_FILES.items():
     # Skip mozharness because it isn't staged.
     if k in ('common', 'mozharness'):
         continue