Bug 1254604 - Use MOZ_SIMPLE_PACKAGE_NAME when building Mulet. Update build location in taskcluster task. r=chmanchester
authorGhislain 'Aus' Lacroix <aus@mozilla.com>
Thu, 17 Mar 2016 16:12:02 -0700
changeset 291667 41c382b7adf3f87ab674f91355a5c9b6273a10b0
parent 291666 2ad5469ab442c2aaf37786a168bb3b6f3cfbc0a5
child 291668 f282fae537d7783faf8f9b335fd0ffab633914c6
push id74648
push usercbook@mozilla.com
push dateTue, 05 Apr 2016 14:54:47 +0000
treeherdermozilla-inbound@98a2f0b4690a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1254604
milestone48.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 1254604 - Use MOZ_SIMPLE_PACKAGE_NAME when building Mulet. Update build location in taskcluster task. r=chmanchester
testing/taskcluster/scripts/builder/build-mulet-linux.sh
testing/taskcluster/tasks/builds/mulet_linux.yml
--- a/testing/taskcluster/scripts/builder/build-mulet-linux.sh
+++ b/testing/taskcluster/scripts/builder/build-mulet-linux.sh
@@ -2,42 +2,36 @@
 
 ################################### build-mulet-linux.sh ###################################
 # Ensure all the scripts in this dir are on the path....
 DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 PATH=$DIRNAME:$PATH
 
 . desktop-setup.sh
 
+# use "simple" package names so that they can be hard-coded in the task's
+# extras.locations
+export MOZ_SIMPLE_PACKAGE_NAME=target
+
 cd $GECKO_DIR
 ./mach build;
 
 ### Make package
 cd $MOZ_OBJDIR;
 make package package-tests buildsymbols;
 
 ### Extract artifacts
 # Navigate to dist/ folder
 cd $MOZ_OBJDIR/dist;
 
 ls -lah $MOZ_OBJDIR/dist/
 
-# Target names are cached so make sure we discard them first if found.
-rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target*.tests.zip
-
 # Artifacts folder is outside of the cache.
 mkdir -p $HOME/artifacts/
 
 # Discard version numbers from packaged files, they just make it hard to write
 # the right filename in the task payload where artifacts are declared
-mv *.linux-x86_64.tar.bz2       $HOME/artifacts/target.linux-x86_64.tar.bz2
-mv *.linux-x86_64.json          $HOME/artifacts/target.linux-x86_64.json
-for name in common cppunittest reftest mochitest xpcshell web-platform; do
-    mv *.$name.tests.zip          $HOME/artifacts/target.$name.tests.zip ;
-done
-mv *.test_packages.json         $HOME/artifacts/target.test_packages.json
-mv *.crashreporter-symbols.zip  $HOME/artifacts/target.crashreporter-symbols.zip
-mv jsshell-linux-x86_64.zip     $HOME/artifacts/jsshell-linux-x86_64.zip
+mv target.*                     $HOME/artifacts
 mv mozharness.zip               $HOME/artifacts/mozharness.zip
 
 ccache -s
 
 ################################### build.sh ###################################
--- a/testing/taskcluster/tasks/builds/mulet_linux.yml
+++ b/testing/taskcluster/tasks/builds/mulet_linux.yml
@@ -49,10 +49,10 @@ task:
       # Disable "TC" prefix...
       groupSymbol: "?"
       machine:
         platform: mulet-linux64
     # Rather then enforcing particular conventions we require that all build
     # tasks provide the "build" extra field to specify where the build and tests
     # files are located.
     locations:
-      build: 'public/build/target.linux-x86_64.tar.bz2'
+      build: 'public/build/target.tar.bz2'
       test_packages: 'public/build/target.test_packages.json'