Make release pipeline architecture-independent.

PiperOrigin-RevId: 432006218
This commit is contained in:
Adin Scannell 2022-03-02 12:48:20 -08:00 committed by gVisor bot
parent 25c6517105
commit 137468a8eb
4 changed files with 16 additions and 10 deletions

View File

@ -21,7 +21,12 @@ build --cxxopt=-std=c++17
# Display the current git revision in the info block. # Display the current git revision in the info block.
build --stamp --workspace_status_command tools/workspace_status.sh build --stamp --workspace_status_command tools/workspace_status.sh
# Set flags for x86_64.
build:x86_64 --crosstool_top=@crosstool//:toolchains
build:x86_64 --cpu=k8
build:x86_64 --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
# Set flags for aarch64. # Set flags for aarch64.
build:cross-aarch64 --crosstool_top=@crosstool//:toolchains --compiler=gcc build:aarch64 --crosstool_top=@crosstool//:toolchains
build:cross-aarch64 --cpu=aarch64 build:aarch64 --cpu=aarch64
build:cross-aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 build:aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64

View File

@ -97,8 +97,8 @@ steps:
- <<: *common - <<: *common
label: ":ship: Release tests" label: ":ship: Release tests"
commands: commands:
- make artifacts/x86_64 - make BAZEL_OPTIONS=--config=x86_64 artifacts/x86_64
- make BAZEL_OPTIONS=--config=cross-aarch64 artifacts/aarch64 - make BAZEL_OPTIONS=--config=aarch64 artifacts/aarch64
- make release - make release
# Images tests. # Images tests.

View File

@ -17,7 +17,7 @@ steps:
- <<: *common - <<: *common
label: ":ship: Push all images (x86_64)" label: ":ship: Push all images (x86_64)"
commands: commands:
- make push-all-images - make ARCH=x86_64 push-all-images
- <<: *common - <<: *common
label: ":ship: Push all images (aarch64)" label: ":ship: Push all images (aarch64)"
commands: commands:
@ -25,11 +25,12 @@ steps:
- <<: *common - <<: *common
label: ":ship: Release" label: ":ship: Release"
commands: commands:
- make artifacts/x86_64 - make BAZEL_OPTIONS=--config=x86_64 artifacts/x86_64
- make BAZEL_OPTIONS=--config=cross-aarch64 artifacts/aarch64 - make BAZEL_OPTIONS=--config=aarch64 artifacts/aarch64
- make release RELEASE_NIGHTLY=$$RELEASE_NIGHTLY - make release RELEASE_NIGHTLY=$$RELEASE_NIGHTLY
- cd repo && gsutil cp -r . gs://gvisor/releases/ - cd repo && gsutil cp -r . gs://gvisor/releases/
- <<: *common - <<: *common
label: ":ship: Website Deploy" label: ":ship: Website Deploy"
commands: commands:
- make website-deploy # The built website image must be x86_64.
- make BAZEL_OPTIONS=--config=x86_64 website-deploy

View File

@ -240,7 +240,7 @@ do-tests: $(RUNTIME_BIN)
@sudo $(RUNTIME_BIN) do true @sudo $(RUNTIME_BIN) do true
.PHONY: do-tests .PHONY: do-tests
arm-qemu-smoke-test: BAZEL_OPTIONS=--config=cross-aarch64 arm-qemu-smoke-test: BAZEL_OPTIONS=--config=aarch64
arm-qemu-smoke-test: $(RUNTIME_BIN) load-arm-qemu arm-qemu-smoke-test: $(RUNTIME_BIN) load-arm-qemu
export T=$$(mktemp -d --tmpdir release.XXXXXX); \ export T=$$(mktemp -d --tmpdir release.XXXXXX); \
mkdir -p $$T/bin/arm64/ && \ mkdir -p $$T/bin/arm64/ && \