| commit | 0c179ad6ab90c748ae128f2e998600ed7aed152e | [log] [tgz] |
|---|---|---|
| author | Jeongik Cha <jeongik@google.com> | Mon Oct 21 07:55:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 21 07:55:40 2024 +0000 |
| tree | 25f5abee8c07a9b6761a271fb0069a3ea0787d1f | |
| parent | af75cc6219008ec4538d2425f39cdeee2e3079c0 [diff] | |
| parent | 6e9355a08595768e6b8ba977547dc71904ffe07b [diff] |
Merge "Modify build artifact's output dir properly" into main am: 6e9355a085 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3313756 Change-Id: I4413e249662caa2c71ea674e429c4af10fff9f6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/build/debian/build.sh b/build/debian/build.sh index 824d6c5..b4e8b2f 100755 --- a/build/debian/build.sh +++ b/build/debian/build.sh
@@ -181,4 +181,4 @@ cp $(dirname $0)/vm_config.json.${arch} vm_config.json # --sparse option isn't supported in apache-commons-compress -tar czv -f ${KOKORO_ARTIFACTS_DIR}/images.tar.gz ${images[@]} vm_config.json \ No newline at end of file +tar czv -f images.tar.gz ${images[@]} vm_config.json \ No newline at end of file
diff --git a/build/debian/kokoro/gcp_ubuntu_docker/aarch64/build.sh b/build/debian/kokoro/gcp_ubuntu_docker/aarch64/build.sh index 07ec01c..7a1523a 100644 --- a/build/debian/kokoro/gcp_ubuntu_docker/aarch64/build.sh +++ b/build/debian/kokoro/gcp_ubuntu_docker/aarch64/build.sh
@@ -6,6 +6,7 @@ sudo losetup -D grep vmx /proc/cpuinfo || true sudo ./build.sh +sudo mv images.tar.gz ${KOKORO_ARTIFACTS_DIR} || true mkdir -p ${KOKORO_ARTIFACTS_DIR}/logs sudo cp -r /var/log/fai/* ${KOKORO_ARTIFACTS_DIR}/logs || true
diff --git a/build/debian/kokoro/gcp_ubuntu_docker/x86_64/build.sh b/build/debian/kokoro/gcp_ubuntu_docker/x86_64/build.sh index cf8776a..66e3d64 100644 --- a/build/debian/kokoro/gcp_ubuntu_docker/x86_64/build.sh +++ b/build/debian/kokoro/gcp_ubuntu_docker/x86_64/build.sh
@@ -6,6 +6,7 @@ sudo losetup -D grep vmx /proc/cpuinfo || true sudo ./build.sh -a x86_64 +sudo mv images.tar.gz ${KOKORO_ARTIFACTS_DIR} || true mkdir -p ${KOKORO_ARTIFACTS_DIR}/logs sudo cp -r /var/log/fai/* ${KOKORO_ARTIFACTS_DIR}/logs || true