Bug 1168612: link uploads to artifacts so that we get logs even on failure; r=mrrrgn
authorDustin J. Mitchell <dustin@mozilla.com>
Fri, 29 May 2015 12:59:39 -0400
changeset 247018 a449c95c4ea30de0d613fdb0049ab48fd7e93aec
parent 247017 b3986709cdde4fa316abfa789e63a3cd5544e15f
child 247019 cafeb76b731763cc116e58e0246c9823d319184b
push id28848
push userryanvm@gmail.com
push dateWed, 03 Jun 2015 20:00:13 +0000
treeherdermozilla-central@0920f2325a6d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrrrgn
bugs1168612
milestone41.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 1168612: link uploads to artifacts so that we get logs even on failure; r=mrrrgn
testing/docker/desktop-build/bin/build.sh
testing/taskcluster/tasks/builds/android_api_11.yml
--- a/testing/docker/desktop-build/bin/build.sh
+++ b/testing/docker/desktop-build/bin/build.sh
@@ -92,19 +92,20 @@ if [ ! -d build ]; then
 fi
 
 # and check out mozilla-central where mozharness will use it as a cache (/builds/hg-shared)
 tc-vcs checkout $WORKSPACE/build/src $GECKO_BASE_REPOSITORY $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV $GECKO_HEAD_REF
 
 # the TC docker worker looks for artifacts to upload in $HOME/artifacts, but
 # mach wants to put them in $WORKSPACE/build/upload; symlinking lets everyone
 # win!
-rm -rf $HOME/build/upload
+rm -rf $WORKSPACE/build/upload
 mkdir -p $HOME/artifacts
-ln -s $HOME/artifacts $HOME/build/upload
+ln -s $HOME/artifacts $WORKSPACE/build/upload
+
 # run mozharness in XVfb, if necessary; this is an array to maintain the quoting in the -s argument
 if $NEED_XVFB; then
     # Some mozharness scripts set DISPLAY=:2
     Xvfb :2 -screen 0 1024x768x24 &
     export DISPLAY=:2
     xvfb_pid=$!
     # Only error code 255 matters, because it signifies that no
     # display could be opened. As long as we can open the display
@@ -171,13 +172,8 @@ done
   --no-clone-tools \
   --no-clobber \
   --no-update \
   --log-level=debug \
   --work-dir=$WORKSPACE/build \
   --no-action=generate-build-stats \
   --branch=${MH_BRANCH} \
   --build-pool=${MH_BUILD_POOL}
-
-# if mozharness has created an "upload" directory, copy all of that into artifacts
-if [ -d $WORKSPACE/build/upload ]; then
-    cp -r $WORKSPACE/build/upload/* $HOME/artifacts/
-fi
--- a/testing/taskcluster/tasks/builds/android_api_11.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11.yml
@@ -48,13 +48,11 @@ task:
       - staging
     treeherder:
       machine:
         # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
         platform: android-4-0-armv7-api11
     # 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.
-# TODO: fennec builds do not yet provide builds and test zips
-#    locations:
-#      build: 'public/build/target.linux-x86_64.tar.bz2'
-#      tests: 'public/build/target.tests.zip'
-
+    locations:
+      build: 'public/build/target.linux-x86_64.tar.bz2'
+      tests: 'public/build/target.tests.zip'