tast-tests: Stop supporting android_all SoftwareDep [chromiumos/platform/tast-tests : master]

[Commit Bot (Gerrit)]

Commit Bot submitted this change.

View Change

Approvals: Hidehiko Abe: Looks good to me, approved Yusuke Sato: Commit; Verified

tast-tests: Stop supporting android_all SoftwareDep

We're removing container R support, and once it's done, android_all
is equivalent to android_p.

BUG=b:147608538
TEST=try

Change-Id: I35e60ecf49863b6a0d8fcb9159cfcd6cbb1008b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/tast-tests/+/2125568
Tested-by: Yusuke Sato <yus...@chromium.org>
Reviewed-by: Hidehiko Abe <hide...@chromium.org>
Commit-Queue: Yusuke Sato <yus...@chromium.org>
---
M src/chromiumos/tast/local/arc/arc.go
M src/chromiumos/tast/local/bundles/cros/arc/boot.go
M src/chromiumos/tast/local/bundles/cros/arc/registration_test.go
3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/chromiumos/tast/local/arc/arc.go b/src/chromiumos/tast/local/arc/arc.go
index 45fde4c..9e01121 100644
--- a/src/chromiumos/tast/local/arc/arc.go
+++ b/src/chromiumos/tast/local/arc/arc.go
@@ -236,7 +236,6 @@
 	"android_vm",
 	"android_vm_p",
 	"android_vm_r",
-	"android_all",
 	"android_p",
 	"arc",
 }
diff --git a/src/chromiumos/tast/local/bundles/cros/arc/boot.go b/src/chromiumos/tast/local/bundles/cros/arc/boot.go
index ec6b87f..cd53aa8 100644
--- a/src/chromiumos/tast/local/bundles/cros/arc/boot.go
+++ b/src/chromiumos/tast/local/bundles/cros/arc/boot.go
@@ -35,7 +35,7 @@
 				numTrials: 1,
 			},
 			ExtraAttr:         []string{"group:mainline"},
-			ExtraSoftwareDeps: []string{"android_all"},
+			ExtraSoftwareDeps: []string{"android_p"},
 			Timeout:           5 * time.Minute,
 		}, {
 			Name: "vm",
@@ -68,7 +68,7 @@
 			Val: bootConfig{
 				numTrials: 1000000,
 			},
-			ExtraSoftwareDeps: []string{"android_all"},
+			ExtraSoftwareDeps: []string{"android_p"},
 			Timeout:           365 * 24 * time.Hour,
 		}, {
 			Name: "vm_forever",
diff --git a/src/chromiumos/tast/local/bundles/cros/arc/registration_test.go b/src/chromiumos/tast/local/bundles/cros/arc/registration_test.go
index 60f14dd..f6a554b 100644
--- a/src/chromiumos/tast/local/bundles/cros/arc/registration_test.go
+++ b/src/chromiumos/tast/local/bundles/cros/arc/registration_test.go
@@ -40,5 +40,5 @@
 }
 
 func TestSoftwareDeps(t *gotesting.T) {
-	testcheck.SoftwareDeps(t, testcheck.Glob(t, pattern), []string{"chrome", "android_vm|android_vm_p|android_vm_r|android_p|android_all|arc"})
+	testcheck.SoftwareDeps(t, testcheck.Glob(t, pattern), []string{"chrome", "android_vm|android_vm_p|android_vm_r|android_p|arc"})
 }

To view, visit change 2125568. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: chromiumos/platform/tast-tests

Gerrit-Branch: master

Gerrit-Change-Id: I35e60ecf49863b6a0d8fcb9159cfcd6cbb1008b0

Gerrit-Change-Number: 2125568

Gerrit-PatchSet: 5

Gerrit-Owner: Yusuke Sato <yus...@chromium.org>

Gerrit-Reviewer: Commit Bot <commi...@chromium.org>

Gerrit-Reviewer: Hidehiko Abe <hide...@chromium.org>

Gerrit-Reviewer: Morg <mo...@chromium.org>

Gerrit-Reviewer: Yusuke Sato <yus...@chromium.org>

Gerrit-MessageType: merged