| commit | 205fe41447245abdff884810d35235eda34556ea | [log] [tgz] |
|---|---|---|
| author | Jeongik Cha <jeongik@google.com> | Mon Oct 21 08:13:09 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 21 08:13:09 2024 +0000 |
| tree | 804cbcf78af48180515967ab164f8c2f586aa0da | |
| parent | d3f05a8047283da856b03fe94e574998d07b1efa [diff] | |
| parent | 0c179ad6ab90c748ae128f2e998600ed7aed152e [diff] |
Merge "Modify build artifact's output dir properly" into main am: 6e9355a085 am: 0c179ad6ab Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3313756 Change-Id: I7c3797b32168d8443611f684d12fdb4feff2407c 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