Make integration tests work in aarch64

Makefile and CPU templates handling is not quite ready for aarch64.

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: kzys

Makefile

@@ -32,8 +32,18 @@ FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.13-buster
 export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
 export GO_CACHE_VOLUME_NAME?=gocache
 
+# This Makefile uses Firecracker's pre-build Linux kernels for x86_64 and aarch64.
+host_arch=$(shell arch)
+ifeq ($(host_arch),x86_64)
+	kernel_sha256sum="bc7e2dbf12cf7038937abf42056f6bcd405d3eef4d27aaa3016f0ba15069ae4b"
+else ifeq ($(host_arch),aarch64)
+	kernel_sha256sum="e2d7c3d6cc123de9e6052d1f434ca7b47635a1f630d63f7fcc1b7164958375e4"
+else
+$(error "$(host_arch) is not supported by Firecracker")
+endif
+FIRECRACKER_TARGET?=$(host_arch)-unknown-linux-musl
+
 FIRECRACKER_DIR=$(SUBMODULES)/firecracker
-FIRECRACKER_TARGET?=x86_64-unknown-linux-musl
 FIRECRACKER_BIN=$(FIRECRACKER_DIR)/build/cargo_target/$(FIRECRACKER_TARGET)/release/firecracker
 FIRECRACKER_BUILDER_NAME?=firecracker-builder
 CARGO_CACHE_VOLUME_NAME?=cargocache
@@ -171,8 +181,8 @@ $(FIRECRACKER_CONTAINERD_RUNTIME_DIR) $(ETC_CONTAINERD):
 DEFAULT_VMLINUX_NAME?=default-vmlinux.bin
 $(DEFAULT_VMLINUX_NAME):
 	curl --silent --show-error --retry 3 --max-time 30 --output $@ \
-		"https://s3.amazonaws.com/spec.ccfc.min/img/quickstart_guide/x86_64/kernels/vmlinux.bin"
-	echo "bc7e2dbf12cf7038937abf42056f6bcd405d3eef4d27aaa3016f0ba15069ae4b $@" | sha256sum -c -
+		"https://s3.amazonaws.com/spec.ccfc.min/img/quickstart_guide/$(host_arch)/kernels/vmlinux.bin"
+	echo "$(kernel_sha256sum) $@" | sha256sum -c -
 	chmod 0400 $@
 
 DEFAULT_VMLINUX_INSTALLPATH=$(FIRECRACKER_CONTAINERD_RUNTIME_DIR)/$(DEFAULT_VMLINUX_NAME)

config/config.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/firecracker-microvm/firecracker-containerd/internal"
 	"github.com/firecracker-microvm/firecracker-containerd/internal/debug"
 	"github.com/firecracker-microvm/firecracker-containerd/proto"
 	models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
@@ -87,12 +88,14 @@ func LoadConfig(path string) (*Config, error) {
 		KernelArgs:      defaultKernelArgs,
 		KernelImagePath: defaultKernelPath,
 		RootDrive:       defaultRootfsPath,
-		CPUTemplate:     string(defaultCPUTemplate),
 		ShimBaseDir:     defaultShimBaseDir,
 		JailerConfig: JailerConfig{
 			RuncConfigPath: runcConfigPath,
 		},
 	}
+	if internal.SupportCPUTemplate() {
+		cfg.CPUTemplate = string(defaultCPUTemplate)
+	}
 
 	if err := json.Unmarshal(data, cfg); err != nil {
 		return nil, errors.Wrapf(err, "failed to unmarshal config from %q", path)

internal/common.go

@@ -17,6 +17,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"runtime"
 )
 
 const (
@@ -125,3 +126,9 @@ func GenerateStubContent(id string) (string, error) {
 
 	return fmt.Sprintf("%s%c%s", MagicStubBytes, byte(length), id), nil
 }
+
+// SupportCPUTemplate returns true if Firecracker supports CPU templates on
+// the current architecture.
+func SupportCPUTemplate() bool {
+	return runtime.GOARCH == "amd64"
+}

runtime/helpers.go

@@ -23,6 +23,7 @@ import (
 	models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
 
 	"github.com/firecracker-microvm/firecracker-containerd/config"
+	"github.com/firecracker-microvm/firecracker-containerd/internal"
 	"github.com/firecracker-microvm/firecracker-containerd/proto"
 )
 
@@ -33,10 +34,12 @@ const (
 
 func machineConfigurationFromProto(cfg *config.Config, req *proto.FirecrackerMachineConfiguration) models.MachineConfiguration {
 	config := models.MachineConfiguration{
-		CPUTemplate: models.CPUTemplate(cfg.CPUTemplate),
-		VcpuCount:   firecracker.Int64(defaultCPUCount),
-		MemSizeMib:  firecracker.Int64(defaultMemSizeMb),
-		HtEnabled:   firecracker.Bool(cfg.HtEnabled),
+		VcpuCount:  firecracker.Int64(defaultCPUCount),
+		MemSizeMib: firecracker.Int64(defaultMemSizeMb),
+		HtEnabled:  firecracker.Bool(cfg.HtEnabled),
+	}
+	if internal.SupportCPUTemplate() {
+		config.CPUTemplate = models.CPUTemplate(cfg.CPUTemplate)
 	}
 
 	if req == nil {

runtime/integ_test.go

@@ -38,7 +38,6 @@ var defaultRuntimeConfig = config.Config{
 	KernelImagePath:       "/var/lib/firecracker-containerd/runtime/default-vmlinux.bin",
 	KernelArgs:            "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.log_color=false systemd.unit=firecracker.target init=/sbin/overlay-init",
 	RootDrive:             "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
-	CPUTemplate:           "T2",
 	LogLevels:             []string{"debug"},
 	ShimBaseDir:           shimBaseDir(),
 	JailerConfig: config.JailerConfig{
@@ -47,6 +46,12 @@ var defaultRuntimeConfig = config.Config{
 	},
 }
 
+func init() {
+	if internal.SupportCPUTemplate() {
+		defaultRuntimeConfig.CPUTemplate = "T2"
+	}
+}
+
 func shimBaseDir() string {
 	if v := os.Getenv(shimBaseDirEnvVar); v != "" {
 		return v