Fix CI build by not hardcoding distro name

Signed-off-by: Tony Fang <[email protected]>

Author: fangn2

Makefile

@@ -29,6 +29,7 @@ UID = $(shell id -u)
 GID = $(shell id -g)
 
 firecracker_version=v1.0.0
+DEV_TOOL_RELESE_BRANCH=firecracker-v1.2
 
 # The below files are needed and can be downloaded from the internet
 release_url=https://github.com/firecracker-microvm/firecracker/releases/download/$(firecracker_version)/firecracker-$(firecracker_version)-$(arch).tgz
@@ -110,7 +111,7 @@ $(FC_TEST_DATA_PATH)/root-drive-ssh-key $(FC_TEST_DATA_PATH)/root-drive-with-ssh
 ifeq ($(GID), 0)
 	$(MAKE) $(FIRECRACKER_DIR)
 	$(FIRECRACKER_DIR)/tools/devtool build_rootfs -m $(FC_TEST_DATA_PATH)/mnt
-	cp $(FIRECRACKER_DIR)/build/rootfs/bionic.rootfs.ext4 $(FC_TEST_DATA_PATH)/root-drive-with-ssh.img
+	cp $(FIRECRACKER_DIR)/build/rootfs/*.rootfs.ext4 $(FC_TEST_DATA_PATH)/root-drive-with-ssh.img
 	cp $(FIRECRACKER_DIR)/build/rootfs/ssh/id_rsa $(FC_TEST_DATA_PATH)/root-drive-ssh-key
 	rm -rf $(FIRECRACKER_DIR)
 else
@@ -133,7 +134,7 @@ $(FC_TEST_DATA_PATH)/ltag:
 	$(call install_go,github.com/kunalkushwaha/ltag,v0.2.3)
 
 $(FIRECRACKER_DIR):
-	- git clone https://github.com/firecracker-microvm/firecracker.git $(FIRECRACKER_DIR)
+	- git clone --branch $(DEV_TOOL_RELESE_BRANCH) https://github.com/firecracker-microvm/firecracker.git $(FIRECRACKER_DIR)
 
 .PHONY: test-images
 test-images: $(FIRECRACKER_BIN) $(JAILER_BIN)

examples/cmd/snapshotting/Makefile

@@ -59,9 +59,9 @@ firecracker:
 
 root-drive-with-ssh.img root-drive-ssh-key:
 	- mkdir temp
-	- git clone https://github.com/firecracker-microvm/firecracker temp
+	- git clone --branch firecracker-${VER%.*}  https://github.com/firecracker-microvm/firecracker temp
 	temp/tools/devtool build_rootfs
-	cp temp/build/rootfs/bionic.rootfs.ext4 root-drive-with-ssh.img
+	cp temp/build/rootfs/*.rootfs.ext4 root-drive-with-ssh.img
 	cp temp/build/rootfs/ssh/id_rsa root-drive-ssh-key
 	rm -rf temp