e2e: add composefs update-reboot test

Factor the TestUpdateReboot body into a shared testUpdateReboot helper
and add TestUpdateRebootComposefs, which boots the worker node from a
composefs disk image and runs the same update lifecycle.

A new WithNodeDiskImage NodeOption lets tests override the VM disk image
passed as --node-image to bink node add. The Makefile and CI workflow
pass BINK_NODE_DISK_IMAGE_COMPOSEFS through to the test binary; the test
skips when the variable is unset.

Closes: #74
Signed-off-by: HarshwardhanPatil07 <harshpat@redhat.com>

Author: HarshwardhanPatil07

.github/workflows/ci.yaml

@@ -152,7 +152,7 @@ jobs:
         run: make gather-bink
 
       - name: Run e2e tests
-        run: make e2e V=1
+        run: make e2e V=1 BINK_NODE_DISK_IMAGE_COMPOSEFS=ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk-composefs
 
       - name: Upload logs
         if: always()

Makefile

@@ -7,6 +7,7 @@ BINK_CLUSTER_NAME ?= e2e
 KUBECONFIG_BINK ?= ./kubeconfig-$(BINK_CLUSTER_NAME)
 ARTIFACTS ?= $(abspath _output/logs)
 BINK_NODE_DISK_IMAGE ?= ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk
+BINK_NODE_DISK_IMAGE_COMPOSEFS ?=
 BINK_LOCAL_REGISTRY_NODE_IMAGE ?= registry.cluster.local:5000/node
 # YEAR defines the year value used for substituting the YEAR placeholder in the boilerplate header.
 YEAR ?= $(shell date +%Y)
@@ -65,6 +66,7 @@ e2e: ## Run e2e tests (requires: make deploy-bink). V=1 for verbose. RUN=<regex>
 	cd test/e2e && KUBECONFIG=$(abspath $(KUBECONFIG_BINK)) BINK_CLUSTER_NAME=$(BINK_CLUSTER_NAME) \
 		$(if $(BINK_NODE_IMAGE),BINK_NODE_IMAGE=$(BINK_NODE_IMAGE)) \
 		BINK_NODE_DISK_IMAGE=$(BINK_NODE_DISK_IMAGE) \
+		$(if $(BINK_NODE_DISK_IMAGE_COMPOSEFS),BINK_NODE_DISK_IMAGE_COMPOSEFS=$(BINK_NODE_DISK_IMAGE_COMPOSEFS)) \
 		BINK_LOCAL_REGISTRY_NODE_IMAGE=$(BINK_LOCAL_REGISTRY_NODE_IMAGE) \
 		ARTIFACTS=$(ARTIFACTS) \
 		BINK_NODE_IMAGE_DIGEST=$$(skopeo inspect --tls-verify=false --format '{{.Digest}}' docker://localhost:5000/node:latest) \

test/e2e/bootcnode_test.go

@@ -95,12 +95,29 @@ func TestControllerMembership(t *testing.T) {
 // original image, then updates the pool to a new image and verifies the
 // full update lifecycle: staging, reboot, and idle with the new image.
 func TestUpdateReboot(t *testing.T) {
+	testUpdateReboot(t)
+}
+
+// TestUpdateRebootComposefs runs the same update lifecycle as
+// TestUpdateReboot but boots the worker node from a composefs disk
+// image. Skipped when BINK_NODE_DISK_IMAGE_COMPOSEFS is not set.
+func TestUpdateRebootComposefs(t *testing.T) {
+	img := os.Getenv("BINK_NODE_DISK_IMAGE_COMPOSEFS")
+	if img == "" {
+		t.Skip("BINK_NODE_DISK_IMAGE_COMPOSEFS not set")
+	}
+	testUpdateReboot(t, e2eutil.WithNodeDiskImage(img))
+}
+
+func testUpdateReboot(t *testing.T, nodeOpts ...e2eutil.NodeOption) {
+	t.Helper()
+
 	g := NewWithT(t)
 	g.SetDefaultEventuallyTimeout(pollTimeout)
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 
 	env := e2eutil.New(t)
-	nodeName := env.AddNode(t)
+	nodeName := env.AddNode(t, nodeOpts...)
 
 	ctx := context.Background()
 

test/e2e/e2eutil/env.go

@@ -117,9 +117,10 @@ func New(t *testing.T) *Env {
 type NodeOption func(*nodeConfig)
 
 type nodeConfig struct {
-	memory       int
-	labels       map[string]string
-	targetImgRef string
+	memory        int
+	labels        map[string]string
+	targetImgRef  string
+	nodeDiskImage string
 }
 
 // WithMemory sets the VM memory in MB for the node.
@@ -140,6 +141,15 @@ func WithLabel(key, value string) NodeOption {
 	}
 }
 
+// WithNodeDiskImage overrides the VM disk image passed as --node-image
+// to bink node add. When unset, AddNode falls back to the
+// BINK_NODE_DISK_IMAGE environment variable.
+func WithNodeDiskImage(img string) NodeOption {
+	return func(c *nodeConfig) {
+		c.nodeDiskImage = img
+	}
+}
+
 // WithTargetImgRef sets the target image reference for the node,
 // passed as --target-imgref to bink node add. Overrides the automatic
 // default that AddNode applies when registry metadata is available.
@@ -178,8 +188,12 @@ func (e *Env) AddNode(t *testing.T, opts ...NodeOption) string {
 	if cfg.memory > 0 {
 		args = append(args, "--memory", fmt.Sprintf("%d", cfg.memory))
 	}
-	if img := os.Getenv("BINK_NODE_DISK_IMAGE"); img != "" {
-		args = append(args, "--node-image", img)
+	diskImage := cfg.nodeDiskImage
+	if diskImage == "" {
+		diskImage = os.Getenv("BINK_NODE_DISK_IMAGE")
+	}
+	if diskImage != "" {
+		args = append(args, "--node-image", diskImage)
 	}
 	args = append(args, "--target-imgref", cfg.targetImgRef)
 	t.Logf("Adding node %q...", nodeName)