Merge pull request #249 from GabyCT/topic/modifytest

test: Modify test_images script to handle FC

tests/test_images.sh

@@ -111,11 +111,13 @@ show_stats()
 	done
 
 	# initrds
+	if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
 		for name in "${!built_initrds[@]}"
 		do
 			sizes=${built_initrds[$name]}
 			add_to_stats_file "$tmpfile" "$name" "$sizes" 'initrd'
 		done
+	fi
 
 	info "Image and rootfs sizes (in bytes and MB), smallest image first:"
 	echo
@@ -221,6 +223,7 @@ set_runtime()
 	# Travis doesn't support VT-x
 	[ -n "${TRAVIS:-}" ] && return
 
+	if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
 		if [ -f "$sysconfig_docker_config_file" ]; then
 			docker_config_file="$sysconfig_docker_config_file"
 			sed_script="s|^( *DOCKER_OPTS=.+--default-runtime[= ] *)[^ \"]+(.*\"$)|\1${name}\2|g"
@@ -232,6 +235,7 @@ set_runtime()
 		sudo -E sed -i -E "$sed_script" "$docker_config_file"
 		sudo -E systemctl daemon-reload
 		sudo -E systemctl restart docker
+	fi
 }
 
 setup()
@@ -506,11 +510,13 @@ test_distros()
 	  bgJobs+=($!)
 	fi
 
+	if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
 		if [ ${#distrosAgent[@]} -gt 0 ]; then
 	  	info "building all rootfses with kata-agent as init"
 	  	make_rootfs ${commonMakeVars[@]} AGENT_INIT=yes "${distrosAgent[@]}" &
 	  	bgJobs+=($!)
 		fi
+	fi
 
 	# Check for build failures (`wait` remembers up to CHILD_MAX bg processes exit status)
 	for j in ${bgJobs[@]}; do
@@ -556,6 +562,8 @@ test_distros()
 			continue
 		fi
 
+
+		if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
 			echo -e "$separator"
 			info "Making initrd image for ${d}"
 			make_initrd ${commonMakeVars[@]} AGENT_INIT=yes $d
@@ -565,6 +573,7 @@ test_distros()
 			built_initrds["${d}"]="${rootfs_size}:${initrd_size}"
 			info "Creating container for ${d}"
 			install_initrd_create_container $initrd_path
+		fi
 	done
 
 	echo -e "$separator"