From 78959588f724423e4356068a6b6013d71ae73936 Mon Sep 17 00:00:00 2001
From: Archana Shinde <archana.m.shinde@intel.com>
Date: Wed, 13 Nov 2019 12:58:28 -0800
Subject: [PATCH] release: Rename generated artifacts to a particular format

Rename artifacts to format kata-static-{artifact-name}.tar.gz.
These predictable names are intended to be consumed by github
actions in our release process.

Fixes #803

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
---
 release/kata-deploy-binaries.sh                    | 14 +++++++-------
 .../qemu-virtiofs/build-static-qemu-virtiofs.sh    | 11 +++++------
 static-build/qemu/build-static-qemu.sh             |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/release/kata-deploy-binaries.sh b/release/kata-deploy-binaries.sh
index 9546a48e58..1a584b533d 100755
--- a/release/kata-deploy-binaries.sh
+++ b/release/kata-deploy-binaries.sh
@@ -110,7 +110,7 @@ install_image() {
 	ln -sf "${initrd}" kata-containers-initrd.img
 	popd >>/dev/null
 	pushd ${destdir}
-	tar -czvf ../kata-image.tar.gz *
+	tar -czvf ../kata-static-image.tar.gz *
 	popd
 }
 
@@ -124,7 +124,7 @@ install_kernel() {
 	DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh install
 	popd
 	pushd ${destdir}
-	tar -czvf ../kata-kernel.tar.gz *
+	tar -czvf ../kata-static-kernel.tar.gz *
 	popd
 }
 
@@ -138,7 +138,7 @@ install_experimental_kernel() {
 	DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh -e install
 	popd
 	pushd ${destdir}
-	tar -czvf ../kata-kernel-experimental.tar.gz *
+	tar -czvf ../kata-static-experimental-kernel.tar.gz *
 	popd
 }
 
@@ -163,7 +163,7 @@ install_firecracker() {
 	sudo install -D --owner root --group root --mode 0744  firecracker/firecracker-static "${destdir}/opt/kata/bin/firecracker"
 	sudo install -D --owner root --group root --mode 0744  firecracker/jailer-static "${destdir}/opt/kata/bin/jailer"
 	pushd ${destdir}
-	tar -czvf ../kata-firecracker-static.tar.gz *
+	tar -czvf ../kata-static-firecracker.tar.gz *
 	popd
 }
 
@@ -231,15 +231,15 @@ EOT
 
 	popd
 	pushd ${destdir}
-	tar -czvf ../kata-components.tar.gz *
+	tar -czvf ../kata-static-kata-components.tar.gz *
 	popd
 }
 
 untar_qemu_binaries() {
 	info "Install static qemu"
-	tar xf kata-qemu-static.tar.gz -C "${destdir}"
+	tar xf kata-static-qemu.tar.gz -C "${destdir}"
 	info "Install static qemu-virtiofs"
-	tar xf kata-qemu-virtiofs-static.tar.gz -C "${destdir}"
+	tar xf kata-static-qemu-virtiofsd.tar.gz -C "${destdir}"
 }
 
 main() {
diff --git a/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh b/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
index e1a21b0903..49b07d7431 100755
--- a/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
+++ b/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
@@ -17,9 +17,8 @@ packaging_dir="${script_dir}/../.."
 qemu_virtiofs_repo=$(get_from_kata_deps "assets.hypervisor.qemu-experimental.url")
 # This tag will be supported on the runtime versions.yaml
 qemu_virtiofs_tag=$(get_from_kata_deps "assets.hypervisor.qemu-experimental.tag")
-qemu_tar="kata-qemu-static.tar.gz"
-qemu_virtiofs_tar="kata-qemu-virtiofs-static.tar.gz"
-qemu_tmp_tar="kata-qemu-virtiofs-static-tmp.tar.gz"
+qemu_virtiofs_tar="kata-static-qemu-virtiofsd.tar.gz"
+qemu_tmp_tar="kata-static-qemu-virtiofsd-tmp.tar.gz"
 
 info "Build ${qemu_virtiofs_repo} tag: ${qemu_virtiofs_tag}"
 
@@ -41,10 +40,10 @@ sudo docker build \
 sudo docker run \
 	-i \
 	-v "${PWD}":/share qemu-virtiofs-static \
-	mv "/tmp/qemu-virtiofs-static/${qemu_tar}" /share/
+	mv "/tmp/qemu-virtiofs-static/${qemu_virtiofs_tar}" /share/
 
-sudo chown ${USER}:${USER} "${PWD}/${qemu_tar}"
+sudo chown ${USER}:${USER} "${PWD}/${qemu_virtiofs_tar}"
 
 # Remove blacklisted binaries
-gzip -d < "${qemu_tar}" | tar --delete --wildcards -f - ${qemu_black_list[*]} | gzip > "${qemu_tmp_tar}"
+gzip -d < "${qemu_virtiofs_tar}" | tar --delete --wildcards -f - ${qemu_black_list[*]} | gzip > "${qemu_tmp_tar}"
 mv -f "${qemu_tmp_tar}" "${qemu_virtiofs_tar}"
diff --git a/static-build/qemu/build-static-qemu.sh b/static-build/qemu/build-static-qemu.sh
index 7e46c837ec..56d2bab31d 100755
--- a/static-build/qemu/build-static-qemu.sh
+++ b/static-build/qemu/build-static-qemu.sh
@@ -14,8 +14,8 @@ source "${script_dir}/../../scripts/lib.sh"
 source "${script_dir}/../qemu.blacklist"
 
 packaging_dir="${script_dir}/../.."
-qemu_tar="kata-qemu-static.tar.gz"
-qemu_tmp_tar="kata-qemu-static-tmp.tar.gz"
+qemu_tar="kata-static-qemu.tar.gz"
+qemu_tmp_tar="kata-static-qemu-tmp.tar.gz"
 
 qemu_repo="${qemu_repo:-}"
 qemu_version="${qemu_version:-}"