diff options
author | Aníbal Limón <anibal.limon@linaro.org> | 2018-07-12 11:35:18 -0500 |
---|---|---|
committer | Aníbal Limón <anibal.limon@linaro.org> | 2018-07-12 11:35:18 -0500 |
commit | c972df48018ab403c5169fec7c72265d0249a5e9 (patch) | |
tree | ed95ed262ca354dd25494557aca82efa021696c8 | |
parent | a30705285e7729cbeab25675fe9c5c377d6f44fc (diff) |
lt-qcom-linux-integration: LAVA enable resize rootfs
The rootfs gets resized when copy modules and firmware so resize
to make sure that is space available for LAVA overlay.
Change-Id: Ib47fd9e9fb9f89b26f018d17c06e183dda52cbee
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
4 files changed, 103 insertions, 0 deletions
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml index 6da346d12e..425b5e0e05 100644 --- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml +++ b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template-functional.yaml @@ -46,6 +46,40 @@ actions: - test: namespace: tlxc timeout: + minutes: 30 + definitions: + - from: inline + name: resize-rootfs + path: inline/resize-rootfs.yaml + repository: + metadata: + description: resize rootfs image for test overlay + format: Lava-Test Test Definition 1.0 + name: resize-rootfs + run: + steps: + - if [ -z "${RESIZE_ROOTFS}" ] + - then + - echo "resize_rootfs:" "skip" + - else + - cd /lava-lxc + - overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz + - overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}') + - overlay_size=$$(( $$overlay_size / 1024 )) + - simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4 + - fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4) + - block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}') + - block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}') + - current_size=$$(( $$block_size * $$block_count / 1024 )) + - final_size=$$(( $$current_size + $$overlay_size + 32768 )) + - resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K + - img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE} + - echo "resize_rootfs:" "pass" + - fi + +- test: + namespace: tlxc + timeout: minutes: 10 definitions: - from: inline diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml index d324c23fa1..f6f35f0bba 100644 --- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml +++ b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template-functional.yaml @@ -48,6 +48,40 @@ actions: - test: namespace: tlxc timeout: + minutes: 30 + definitions: + - from: inline + name: resize-rootfs + path: inline/resize-rootfs.yaml + repository: + metadata: + description: resize rootfs image for test overlay + format: Lava-Test Test Definition 1.0 + name: resize-rootfs + run: + steps: + - if [ -z "${RESIZE_ROOTFS}" ] + - then + - echo "resize_rootfs:" "skip" + - else + - cd /lava-lxc + - overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz + - overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}') + - overlay_size=$$(( $$overlay_size / 1024 )) + - simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4 + - fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4) + - block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}') + - block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}') + - current_size=$$(( $$block_size * $$block_count / 1024 )) + - final_size=$$(( $$current_size + $$overlay_size + 32768 )) + - resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K + - img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE} + - echo "resize_rootfs:" "pass" + - fi + +- test: + namespace: tlxc + timeout: minutes: 10 definitions: - from: inline diff --git a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml index a0f3dffd37..e5b11635cc 100644 --- a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml +++ b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template-functional.yaml @@ -47,6 +47,40 @@ actions: - test: namespace: tlxc timeout: + minutes: 30 + definitions: + - from: inline + name: resize-rootfs + path: inline/resize-rootfs.yaml + repository: + metadata: + description: resize rootfs image for test overlay + format: Lava-Test Test Definition 1.0 + name: resize-rootfs + run: + steps: + - if [ -z "${RESIZE_ROOTFS}" ] + - then + - echo "resize_rootfs:" "skip" + - else + - cd /lava-lxc + - overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz + - overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}') + - overlay_size=$$(( $$overlay_size / 1024 )) + - simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4 + - fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4) + - block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}') + - block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}') + - current_size=$$(( $$block_size * $$block_count / 1024 )) + - final_size=$$(( $$current_size + $$overlay_size + 32768 )) + - resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K + - img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE} + - echo "resize_rootfs:" "pass" + - fi + +- test: + namespace: tlxc + timeout: minutes: 10 definitions: - from: inline diff --git a/lt-qcom-linux-integration/submit_for_testing.sh b/lt-qcom-linux-integration/submit_for_testing.sh index bc22a34e06..b1e10dae7c 100755 --- a/lt-qcom-linux-integration/submit_for_testing.sh +++ b/lt-qcom-linux-integration/submit_for_testing.sh @@ -18,6 +18,7 @@ export LXC_BOOT_ROOTFS_FILE=$(basename ${BOOT_ROOTFS_URL}) export ROOTFS_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_FILE} export ROOTFS_URL_COMP="gz" export LXC_ROOTFS_FILE=$(basename ${ROOTFS_URL} .gz) +export RESIZE_ROOTFS=True case "${MACHINE}" in dragonboard410c|dragonboard820c|sdm845_mtp) |