From 9ad409ccbc3253769b2fa4bbf86613680c971224 Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Tue, 16 Jul 2019 18:47:25 +0000
Subject: [PATCH] Bug 1561774 - Copy win64-aarch64-opt test artifacts into the
 shippable build; r=firefox-build-system-reviewers,chmanchester

In order to run tests against the win64-aarch64-shippable build, we need
the test packages from the aarch64-no-eme build since the tests aren't
compiled during the -shippable stage. Since packages like cppunittest
and the target.test_packages.json file won't be generated correctly in
the -shippable stage, we disable the package-step tests there by setting
MOZ_AUTOMATION_PACKAGE_TESTS to 0 in the environment.

Differential Revision: https://phabricator.services.mozilla.com/D37895

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/build/windows.yml | 40 +++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index 1687db3ab282..c239afecdbdd 100755
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1052,6 +1052,7 @@ win64-aarch64-shippable/opt:
             PERFHERDER_EXTRA_OPTIONS: aarch64
             MOZ_ARTIFACT_TASK: {task-reference: '<win64-aarch64-opt>'}
             MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: '<win32-opt>'}
+            MOZ_AUTOMATION_PACKAGE_TESTS: '0'
             USE_ARTIFACT: '1'
     run:
         actions: [get-secrets, build]
@@ -1070,10 +1071,43 @@ win64-aarch64-shippable/opt:
         win32-opt: build-win32-shippable/opt
         win64-aarch64-opt: build-win64-aarch64-shippable-no-eme/opt
     fetches:
-        # Abuse fetches to copy the generated-files artifact from the non-eme
-        # build directly to the artifacts directory of this build. Likewise
-        # for target.langpack.xpi
+        # Abuse fetches to copy the generated-files, langpack, and test
+        # artifacts from the non-eme build directly to the artifacts directory
+        # of this build.
         win64-aarch64-opt:
+            - artifact: target.test_packages.json
+              extract: false
+              dest: ../public/build
+            - artifact: target.common.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.cppunittest.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.mochitest.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.reftest.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.talos.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.raptor.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.awsy.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.xpcshell.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.web-platform.tests.tar.gz
+              extract: false
+              dest: ../public/build
+            - artifact: target.updater-dep.tests.tar.gz
+              extract: false
+              dest: ../public/build
             - artifact: target.generated-files.tar.gz
               extract: false
               dest: ../public/build