Use local host_orchestrator/api/v1 package in e2etests.

google · Nov 5, 2024 · c73ac5f · c73ac5f
1 parent 1234ab8
commit c73ac5f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 20 deletions.
diff --git a/e2etests/BUILD.bazel b/e2etests/BUILD.bazel
@@ -17,9 +17,9 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 GO_PREFIX = "github.com/google/android-cuttlefish/e2etests"
 
 # gazelle:resolve_regexp go github.com/google/android-cuttlefish/frontend/src/libhoclient/* @libhoclient
+# gazelle:resolve_regexp go github.com/google/android-cuttlefish/frontend/src/host_orchestrator/api/v1 @host_orchestrator//api/v1:api
 gazelle(
     name = "gazelle",
     external = "external",
     prefix = GO_PREFIX,
 )
-
diff --git a/e2etests/WORKSPACE b/e2etests/WORKSPACE
@@ -55,3 +55,13 @@ local_repository(
     name = "libhoclient",
     path = "../frontend/src/libhoclient",
 )
+
+local_repository(
+    name = "host_orchestrator",
+    path = "../frontend/src/host_orchestrator",
+)
+
+local_repository(
+    name = "liboperator",
+    path = "../frontend/src/liboperator",
+)
diff --git a/e2etests/go_repositories.bzl b/e2etests/go_repositories.bzl
@@ -163,18 +163,6 @@ def repos():
         sum = "h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=",
         version = "v1.1.1",
     )
-    go_repository(
-        name = "com_github_google_android_cuttlefish_frontend_src_host_orchestrator",
-        importpath = "github.com/google/android-cuttlefish/frontend/src/host_orchestrator",
-        sum = "h1:GyA/c0U7dGi1oWoMSmGF00UcsBJxv+eZAiO5qirM9Ak=",
-        version = "v0.0.0-20241011194822-c22ea981e7da",
-    )
-    go_repository(
-        name = "com_github_google_android_cuttlefish_frontend_src_liboperator",
-        importpath = "github.com/google/android-cuttlefish/frontend/src/liboperator",
-        sum = "h1:5ph/60ouIJj+YvXVeob5FU8rPCyjzWgjb8+x7k9QcKU=",
-        version = "v0.0.0-20240502215314-3182038fb7ea",
-    )
     go_repository(
         name = "com_github_google_cloud_android_orchestration",
         importpath = "github.com/google/cloud-android-orchestration",

diff --git a/e2etests/orchestration/create_from_images_zip_test/BUILD.bazel b/e2etests/orchestration/create_from_images_zip_test/BUILD.bazel
@@ -24,8 +24,8 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
         "@com_github_google_go_cmp//cmp",
+        "@host_orchestrator//api/v1:api",
         "@libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/create_local_image_test/BUILD.bazel b/e2etests/orchestration/create_local_image_test/BUILD.bazel
@@ -24,9 +24,8 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_cloud_android_orchestration//pkg/client",
         "@com_github_google_go_cmp//cmp",
+        "@host_orchestrator//api/v1:api",
         "@libhoclient",
     ],
 )
diff --git a/e2etests/orchestration/create_single_instance_test/def.bzl b/e2etests/orchestration/create_single_instance_test/def.bzl
@@ -27,9 +27,8 @@ def create_single_instance_test(name, build_id, build_target):
         },
         deps = [
             "//orchestration/common",
-            "@com_github_google_cloud_android_orchestration//pkg/client",
-            "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
             "@com_github_google_go_cmp//cmp",
+            "@host_orchestrator//api/v1:api",
             "@libhoclient",
         ],
     )
diff --git a/e2etests/orchestration/snapshot_test/BUILD.bazel b/e2etests/orchestration/snapshot_test/BUILD.bazel
@@ -24,9 +24,8 @@ go_test(
     ],
     deps = [
         "//orchestration/common",
-        "@com_github_google_android_cuttlefish_frontend_src_host_orchestrator//api/v1:api",
-        "@com_github_google_cloud_android_orchestration//pkg/client",
         "@com_github_google_go_cmp//cmp",
+        "@host_orchestrator//api/v1:api",
         "@libhoclient",
     ],
 )