Bug 1357753: create (correct) artifact directories with native-engine; r=wcosta
authorDustin J. Mitchell <dustin@mozilla.com>
Fri, 12 May 2017 19:24:24 +0000
changeset 409439 e7703bd2ef36bca028dea4f2b93c611a68b5d120
parent 409438 1f135333d095525ffebafd7f774f246995207b3d
child 409440 4c6b36ee9f171c7a3831e30309a925cfe710d329
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1357753
milestone55.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 1357753: create (correct) artifact directories with native-engine; r=wcosta The mozharness_test job was using the wrong artifact path for native-engine. Native-engine also enforces that artifact directories exist, so include some mkdir calls to keep it happy. MozReview-Commit-ID: Evw34gzzLev
taskcluster/scripts/tester/test-linux.sh
taskcluster/taskgraph/transforms/job/mozharness_test.py
--- a/taskcluster/scripts/tester/test-linux.sh
+++ b/taskcluster/scripts/tester/test-linux.sh
@@ -50,17 +50,20 @@ maybe_start_pulse() {
 # test required parameters are supplied
 if [ -z "${MOZHARNESS_PATH}" -a -z "${MOZHARNESS_URL}" ]; then
     fail "MOZHARNESS_PATH or MOZHARNESS_URL must be defined";
 fi
 
 if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
 if [[ -z ${MOZHARNESS_CONFIG} ]]; then fail "MOZHARNESS_CONFIG is not set"; fi
 
+# make sure artifact directories exist
+mkdir -p $WORKSPACE/build/upload/logs
 mkdir -p ~/artifacts/public
+mkdir -p $WORKSPACE/build/blobber_upload_dir
 
 cleanup() {
     local rv=$?
     if [[ -s $HOME/.xsession-errors ]]; then
       # To share X issues
       cp $HOME/.xsession-errors ~/artifacts/public/xsession-errors.log
     fi
     if $NEED_XVFB; then
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -14,23 +14,16 @@ from taskgraph.transforms.tests import (
     normpath
 )
 from taskgraph.transforms.job.common import (
     support_vcs_checkout,
 )
 import os
 import re
 
-ARTIFACTS = [
-    # (artifact name prefix, in-image path)
-    ("public/logs/", "build/upload/logs/"),
-    ("public/test", "artifacts/"),
-    ("public/test_info/", "build/blobber_upload_dir/"),
-]
-
 BUILDER_NAME_PREFIX = {
     'linux64-pgo': 'Ubuntu VM 12.04 x64',
     'linux64': 'Ubuntu VM 12.04 x64',
     'linux64-nightly': 'Ubuntu VM 12.04 x64',
     'linux64-asan': 'Ubuntu ASAN VM 12.04 x64',
     'linux64-ccov': 'Ubuntu Code Coverage VM 12.04 x64',
     'linux64-jsdcov': 'Ubuntu Code Coverage VM 12.04 x64',
     'linux64-stylo': 'Ubuntu VM 12.04 x64',
@@ -326,17 +319,22 @@ def mozharness_test_on_native_engine(con
                                          'public/build/{}.test_packages.json'.format(target))
     mozharness_url = get_artifact_url('<build>',
                                       'public/build/mozharness.zip')
 
     worker['artifacts'] = [{
         'name': prefix.rstrip('/'),
         'path': path.rstrip('/'),
         'type': 'directory',
-    } for (prefix, path) in ARTIFACTS]
+    } for (prefix, path) in [
+        # (artifact name prefix, in-image path relative to homedir)
+        ("public/logs/", "workspace/build/upload/logs/"),
+        ("public/test", "artifacts/"),
+        ("public/test_info/", "workspace/build/blobber_upload_dir/"),
+    ]]
 
     if test['reboot']:
         worker['reboot'] = test['reboot']
 
     worker['env'] = env = {
         'GECKO_HEAD_REPOSITORY': config.params['head_repository'],
         'GECKO_HEAD_REV': config.params['head_rev'],
         'MOZHARNESS_CONFIG': ' '.join(mozharness['config']),