e2e: derive composefs image from BINK_NODE_DISK_IMAGE

Instead of hardcoding the composefs image in CI, derive it from
BINK_NODE_DISK_IMAGE by appending -composefs. This keeps both
variables in sync and requires no CI-specific overrides.

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 BINK_NODE_DISK_IMAGE_COMPOSEFS=ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk-composefs
+        run: make e2e V=1
 
       - name: Upload logs
         if: always()

Makefile

@@ -7,7 +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_NODE_DISK_IMAGE_COMPOSEFS ?= $(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)
@@ -66,7 +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_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) \