Bug 1858915 [wpt PR 42525] - Use taskcluster-run in infra tests, a=te…

…stonly

Automatic update from web-platform-tests
Ensure we pass the right command line options to Firefox Android on TC

--
Use taskcluster-run.py for infra tests

This makes it closer to the setup for full runs.

--

wpt-commits: 8d1f8cfdad47676ec226056a17a3c9d70ec75c0b, 312c66043fdcc3848fcaa66be6d6e23ca11e9380
wpt-pr: 42525

UltraBlame original commit: d2ab56c7ca8f0ad07c3a54af158b43a763069f23

testing/web-platform/tests/tools/ci/ci_wptrunner_infrastructure.sh

@@ -7,16 +7,21 @@ bash
 set
 -
 ex
-SCRIPT_DIR
+REL_DIR_NAME
 =
 (
-cd
-(
 dirname
 "
 0
 "
 )
+SCRIPT_DIR
+=
+(
+cd
+"
+REL_DIR_NAME
+"
 &
 &
 pwd
@@ -33,65 +38,49 @@ SCRIPT_DIR
 .
 .
 cd
+"
 WPT_ROOT
+"
 run_infra_test
 (
 )
 {
-TERM
-=
-dumb
 .
 /
-wpt
-run
--
--
-log
--
-mach
--
--
--
-yes
--
--
-manifest
-~
+tools
 /
-meta
+ci
 /
-MANIFEST
+taskcluster
+-
+run
 .
-json
+py
+"
+1
+"
+"
+2
+"
+-
+-
 -
 -
 metadata
+=
 infrastructure
 /
 metadata
 /
 -
 -
-install
--
-fonts
--
--
-install
--
-webdriver
--
--
 log
 -
 wptreport
 =
 "
-/
-home
-/
-test
+.
+.
 /
 artifacts
 /
@@ -101,102 +90,37 @@ wptreport
 .
 json
 "
-2
-1
+-
+-
+include
+=
 infrastructure
 /
 }
 main
 (
 )
 {
-.
-/
-wpt
-manifest
--
--
-rebuild
--
-p
-~
-/
-meta
-/
-MANIFEST
-.
-json
 run_infra_test
 "
 chrome
 "
 "
--
--
-binary
-=
-(
-which
-google
--
-chrome
--
-unstable
-)
--
--
-enable
--
-swiftshader
--
--
-channel
 dev
-1
 "
 run_infra_test
 "
 firefox
 "
 "
--
--
-binary
-=
-~
-/
-build
-/
-firefox
-/
-firefox
-1
+nightly
 "
 run_infra_test
 "
 firefox_android
 "
 "
--
--
-install
--
-browser
--
--
-logcat
--
-dir
-=
-/
-home
-/
-test
-/
-artifacts
-/
-1
+nightly
 "
 }
 main
-1

testing/web-platform/tests/tools/ci/taskcluster-run.py

@@ -34,6 +34,7 @@
 (
 product
 channel
+artifact_path
 )
 :
 
@@ -131,6 +132,41 @@
 "
 ]
 
+if
+product
+=
+=
+"
+firefox_android
+"
+:
+
+return
+[
+"
+-
+-
+install
+-
+browser
+"
+"
+-
+-
+install
+-
+webdriver
+"
+"
+-
+-
+logcat
+-
+dir
+"
+artifact_path
+]
+
 if
 product
 =
@@ -479,6 +515,7 @@
 product
 channel
 commit_range
+artifact_path
 wpt_args
 )
 :
@@ -744,6 +781,7 @@
 (
 product
 channel
+artifact_path
 )
 
 #
@@ -801,6 +839,13 @@
 )
 ]
 
+wpt_args
+.
+append
+(
+product
+)
+
 command
 =
 [
@@ -818,10 +863,6 @@
 ]
 +
 wpt_args
-+
-[
-product
-]
 
 logger
 .
@@ -847,18 +888,19 @@
 with
 open
 (
+os
+.
+path
+.
+join
+(
+artifact_path
 "
-/
-home
-/
-test
-/
-artifacts
-/
 checkrun
 .
 md
 "
+)
 "
 a
 "
@@ -1041,6 +1083,46 @@
 "
 )
 
+parser
+.
+add_argument
+(
+"
+-
+-
+artifact
+-
+path
+"
+action
+=
+"
+store
+"
+
+default
+=
+"
+/
+home
+/
+test
+/
+artifacts
+/
+"
+
+help
+=
+"
+Path
+to
+store
+output
+files
+"
+)
+
 parser
 .
 add_argument