|
 |
ffd6ed |
From 3f79c623f68192418c90a4bdc71a9fe49d76f9a9 Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
ffd6ed |
Date: Wed, 15 Apr 2015 15:27:11 +0200
|
|
|
ffd6ed |
Subject: [PATCH] v2v: test-v2v-i-ova-formats.sh: test ova as tar.gz and tar.xz
|
|
|
ffd6ed |
|
|
|
ffd6ed |
Extend test-v2v-i-ova-formats.sh to test for tarballs compressed as gzip
|
|
|
ffd6ed |
or xz; followup of commit 3c582cfb8d62013a935953e919c79009452254f9.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
(cherry picked from commit 8f5503096598ac38bb5da8efab517d5cf36cb760)
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
v2v/test-v2v-i-ova-formats.sh | 8 +++++++-
|
|
|
ffd6ed |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/v2v/test-v2v-i-ova-formats.sh b/v2v/test-v2v-i-ova-formats.sh
|
|
|
ffd6ed |
index a9b2a96..bd3e048 100755
|
|
|
ffd6ed |
--- a/v2v/test-v2v-i-ova-formats.sh
|
|
|
ffd6ed |
+++ b/v2v/test-v2v-i-ova-formats.sh
|
|
|
ffd6ed |
@@ -22,7 +22,7 @@ unset CDPATH
|
|
|
ffd6ed |
export LANG=C
|
|
|
ffd6ed |
set -e
|
|
|
ffd6ed |
|
|
|
ffd6ed |
-formats="tar zip"
|
|
|
ffd6ed |
+formats="tar zip tar-gz tar-xz"
|
|
|
ffd6ed |
|
|
|
ffd6ed |
if [ -n "$SKIP_TEST_V2V_I_OVA_FORMATS_SH" ]; then
|
|
|
ffd6ed |
echo "$0: test skipped because environment variable is set"
|
|
|
ffd6ed |
@@ -71,6 +71,12 @@ for format in $formats; do
|
|
|
ffd6ed |
zip -r test ../test-v2v-i-ova-formats.ovf disk1.vmdk disk1.mf
|
|
|
ffd6ed |
mv test.zip test-$format.ova
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
+ tar-gz)
|
|
|
ffd6ed |
+ tar -czf test-$format.ova ../test-v2v-i-ova-formats.ovf disk1.vmdk disk1.mf
|
|
|
ffd6ed |
+ ;;
|
|
|
ffd6ed |
+ tar-xz)
|
|
|
ffd6ed |
+ tar -cJf test-$format.ova ../test-v2v-i-ova-formats.ovf disk1.vmdk disk1.mf
|
|
|
ffd6ed |
+ ;;
|
|
|
ffd6ed |
*)
|
|
|
ffd6ed |
echo "Unhandled format '$format'"
|
|
|
ffd6ed |
exit 1
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|