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

@@ -7,6 +7,10 @@ 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;
 
@@ -20,22 +24,12 @@ 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

testing/taskcluster/tasks/builds/mulet_linux.yml

@@ -54,5 +54,5 @@ task:
     # 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'