Move packaging logic from kokoro/**/build.sh to build.sh
Bug: 373248801
Bug: 374244795
Test: build and run
Change-Id: I0a4575b33340dafd24babe61008da419bb77064e
diff --git a/build/debian/build.sh b/build/debian/build.sh
index 71a9d3b..62304a4 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -79,7 +79,14 @@
)
else
packages+=(
- qemu-system
+ qemu-
+ )
+ fi
+
+ # TODO(b/365955006): remove these lines when uboot supports x86_64 EFI application
+ if [[ "$arch" == "x86_64" ]]; then
+ packages+=(
+ libguestfs-tools
)
fi
DEBIAN_FRONTEND=noninteractive \
@@ -160,3 +167,16 @@
copy_android_config
run_fai
fdisk -l image.raw
+images=(image.raw)
+# TODO(b/365955006): remove these lines when uboot supports x86_64 EFI application
+if [[ "$arch" == "x86_64" ]]; then
+ virt-get-kernel -a image.raw
+ mv vmlinuz* vmlinuz
+ mv initrd.img* initrd.img
+ images+=(
+ vmlinuz
+ initrd.img
+ )
+fi
+# --sparse option isn't supported in apache-commons-compress
+tar czv -f ${KOKORO_ARTIFACTS_DIR}/images.tar.gz ${images[@]} vm_config.json.${arch} --transform s/vm_config.json.${arch}/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 257b7da..07ec01c 100644
--- a/build/debian/kokoro/gcp_ubuntu_docker/aarch64/build.sh
+++ b/build/debian/kokoro/gcp_ubuntu_docker/aarch64/build.sh
@@ -6,8 +6,6 @@
sudo losetup -D
grep vmx /proc/cpuinfo || true
sudo ./build.sh
-# --sparse option isn't supported in apache-commons-compress
-tar czv -f ${KOKORO_ARTIFACTS_DIR}/images.tar.gz image.raw vm_config.json.aarch64 --transform s/vm_config.json.aarch64/vm_config.json/
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 ab675f0..cf8776a 100644
--- a/build/debian/kokoro/gcp_ubuntu_docker/x86_64/build.sh
+++ b/build/debian/kokoro/gcp_ubuntu_docker/x86_64/build.sh
@@ -6,7 +6,6 @@
sudo losetup -D
grep vmx /proc/cpuinfo || true
sudo ./build.sh -a x86_64
-tar czvS -f ${KOKORO_ARTIFACTS_DIR}/images.tar.gz image.raw
mkdir -p ${KOKORO_ARTIFACTS_DIR}/logs
sudo cp -r /var/log/fai/* ${KOKORO_ARTIFACTS_DIR}/logs || true
diff --git a/build/debian/vm_config.json.aarch64 b/build/debian/vm_config.json.aarch64
index c9a16bf..658ecfc 100644
--- a/build/debian/vm_config.json.aarch64
+++ b/build/debian/vm_config.json.aarch64
@@ -7,6 +7,9 @@
"writable": true
}
],
+ "kernel": "$PAYLOAD_DIR/vmlinuz",
+ "initrd": "$PAYLOAD_DIR/initrd.img",
+ "params": "root=/dev/vda1",
"protected": false,
"cpu_topology": "match_host",
"platform_version": "~1.0",
diff --git a/build/debian/vm_config.json.x86_64 b/build/debian/vm_config.json.x86_64
new file mode 100644
index 0000000..c9a16bf
--- /dev/null
+++ b/build/debian/vm_config.json.x86_64
@@ -0,0 +1,20 @@
+{
+ "name": "debian",
+ "disks": [
+ {
+ "image": "$PAYLOAD_DIR/image.raw",
+ "partitions": [],
+ "writable": true
+ }
+ ],
+ "protected": false,
+ "cpu_topology": "match_host",
+ "platform_version": "~1.0",
+ "memory_mib": 4096,
+ "debuggable": true,
+ "console_out": true,
+ "connect_console": true,
+ "console_input_device": "ttyS0",
+ "network": true
+}
+