Skip to content

Migrate e2etests to bazel 9 #2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Databean wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −8
Open

Migrate e2etests to bazel 9 #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/cvd/tools/bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [ "${DISABLE_BAZEL_WRAPPER}" != "" ] \
fi

# Read the bazel version from .bazelversion file in the root of the repository
BAZELVERSION_FILE_PATH="$(dirname $(readlink -f "$0"))/../.bazelversion"
BAZELVERSION_FILE_PATH="$(dirname "$0")/../.bazelversion"
VERSION_FROM_BAZELVERSION_FILE=$(cat ${BAZELVERSION_FILE_PATH})
VERSION=${OVERRIDE_BAZEL_VERSION:-${VERSION_FROM_BAZELVERSION_FILE}}
cat << EOF >&2
Expand Down
2 changes: 1 addition & 1 deletion e2etests/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.5.1
9.0.0
5 changes: 3 additions & 2 deletions e2etests/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bazel_dep(name = "gazelle", version = "0.40.0")
bazel_dep(name = "rules_go", version = "0.50.1")
bazel_dep(name = "gazelle", version = "0.47.0")
bazel_dep(name = "rules_go", version = "0.59.0")
bazel_dep(name = "rules_shell", version = "0.6.1")

go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.23.1")
Expand Down
10 changes: 6 additions & 4 deletions e2etests/cvd/boot_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
load("@rules_shell//shell:sh_test.bzl", "sh_test")

def launch_cvd_boot_test(name, branch, target, credential_source = ""):
args = ["-b", branch, "-t", target]
if credential_source:
args += ["-c", credential_source]
native.sh_test(
sh_test(
name = name,
size = "medium",
srcs = ["launch_cvd_boot_test.sh"],
Expand All @@ -18,7 +20,7 @@ def cvd_load_boot_test(name, env_file, size = "medium", credential_source = ""):
args = ["-e", "cvd/" + env_file]
if credential_source:
args += ["-c", credential_source]
native.sh_test(
sh_test(
name = name,
size = size,
srcs = ["cvd_load_boot_test.sh"],
Expand All @@ -38,7 +40,7 @@ def cvd_command_boot_test(name, branch, target, cvd_command = [], credential_sou
if substitutions:
args += ["-s", ",".join(substitutions)]
args += cvd_command
native.sh_test(
sh_test(
name = name,
size = "medium",
srcs = ["cvd_command_boot_test.sh"],
Expand All @@ -54,7 +56,7 @@ def metrics_test(name, branch, target, credential_source = ""):
args = ["-b", branch, "-t", target]
if credential_source:
args += ["-c", credential_source]
native.sh_test(
sh_test(
name = name,
size = "medium",
srcs = ["metrics_test.sh"],
Expand Down
1 change: 1 addition & 0 deletions e2etests/orchestration/artifacts/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

load("def.bzl", "aosp_artifact")
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")

sh_binary(
name = "fetch_aosp_artifact",
Expand Down
Loading