diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-09 18:48:52 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-09 18:51:17 -0800 |
| commit | 65a2242db409e7f4aeef04a01eb4f89699557866 (patch) | |
| tree | cfb631cdab80793dadb00d19e4039a0d8826deb0 /tools/bazel.mk | |
| parent | 92ca72ecb73d91e9def31e7f9835adf7a50b3d65 (diff) | |
Tweak aarch64 support.
A few images were broken with respect to aarch64. We should now
be able to run push-all-images with ARCH=aarch64 as part of the
regular continuous integration builds, and add aarch64 smoke tests
(via user emulation for now) to the regular test suite (future).
PiperOrigin-RevId: 346685462
Diffstat (limited to 'tools/bazel.mk')
| -rw-r--r-- | tools/bazel.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/bazel.mk b/tools/bazel.mk index ae99a2c76..396785e16 100644 --- a/tools/bazel.mk +++ b/tools/bazel.mk @@ -44,8 +44,8 @@ BUILD_ROOTS := bazel-bin/ bazel-out/ # Bazel container configuration (see below). USER := $(shell whoami) HASH := $(shell readlink -m $(CURDIR) | md5sum | cut -c1-8) -BUILDER_NAME := gvisor-builder-$(HASH) -DOCKER_NAME := gvisor-bazel-$(HASH) +BUILDER_NAME := gvisor-builder-$(HASH)-$(ARCH) +DOCKER_NAME := gvisor-bazel-$(HASH)-$(ARCH) DOCKER_PRIVILEGED := --privileged BAZEL_CACHE := $(shell readlink -m ~/.cache/bazel/) GCLOUD_CONFIG := $(shell readlink -m ~/.config/gcloud/) @@ -164,7 +164,7 @@ bazel-image: load-default ## Ensures that the local builder exists. @docker commit $(BUILDER_NAME) gvisor.dev/images/builder .PHONY: bazel-image -ifeq (,$(findstring $(DOCKER_NAME),$(shell docker ps 2>/dev/null))) +ifneq (true,$(shell $(wrapper echo true))) bazel-server: bazel-image ## Ensures that the server exists. @$(call header,DOCKER RUN) @docker rm -f $(DOCKER_NAME) 2>/dev/null || true @@ -208,6 +208,10 @@ run = $(call header,RUN $(1) $(2)) && $(call build_paths,$(1),{} $(2)) sudo = $(call header,SUDO $(1) $(2)) && $(call build_paths,$(1),sudo -E {} $(2)) test = $(call header,TEST $(1)) && $(call wrapper,$(BAZEL) test $(TEST_OPTIONS) $(1)) +clean: ## Cleans the bazel cache. + @$(call clean) +.PHONY: clean + testlogs: ## Returns the most recent set of test logs. @if test -f .build_events.json; then \ cat .build_events.json | jq -r \ |