commit ce7af69938e0acdf373b46625d9954a10c1b9146
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 20 08:22:52 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 20 08:22:52 2024 +0000
tree 766e80af996942aa06ea35f3a893aba1e4c195e7
parent fd6508dd9b7933ea8d6595f2118981a5942e065c
parent ffa4de038a14e916ef7fd87d2f56d5e9457cccd6

Merge "Ferrochrome: Extracting image while downloading" into main am: ffa4de038a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3133180

Change-Id: Ic06a43ac360a8fbd2a5a0cb20c7e1fe252186b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/ferrochrome/ferrochrome.sh

diff --git a/tests/ferrochrome/ferrochrome.sh b/tests/ferrochrome/ferrochrome.sh
index 5638b34..92702ee 100755
--- a/tests/ferrochrome/ferrochrome.sh
+++ b/tests/ferrochrome/ferrochrome.sh
@@ -100,13 +100,9 @@
     # DISCLAIMER: Image is too large (1.5G+ for compressed, 6.5G+ for uncompressed), so can't submit.
     fecr_dir=$(mktemp -d)
 
-    echo "Downloading ferrochrome image to ${fecr_dir}"
+    echo "Downloading & extracting ferrochrome image to ${fecr_dir}"
     fecr_version=${fecr_version:-${FECR_DEFAULT_VERSION}}
-    curl --output-dir ${fecr_dir} -O ${FECR_GS_URL}/${fecr_version}/chromiumos_test_image.tar.xz
-  fi
-  if [[ ! -f "${fecr_dir}/chromiumos_test_image.bin" ]]; then
-    echo "Extrating ferrochrome image"
-    tar xvf ${fecr_dir}/chromiumos_test_image.tar.xz -C ${fecr_dir} > /dev/null
+    curl ${FECR_GS_URL}/${fecr_version}/chromiumos_test_image.tar.xz | tar xfJ - -C ${fecr_dir}
   fi
 
   echo "Pushing ferrochrome image to ${FECR_DEVICE_DIR}"