From 38acadd0d92dc749a61019603a25d515ca498ee0 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Mon, 27 Nov 2023 15:25:15 -0500
Subject: [PATCH] ci: Add alpine:edge image to those cloned and use it in test.

The alpine image being used for the sbom test was already being
used (and cloned).  There is no reason to depend on ghcr.io for it.

Signed-off-by: Scott Moser <smoser@brickies.net>
---
 Makefile          | 9 ++++++---
 test/bom.bats     | 4 ++--
 test/helpers.bash | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a7ddb80e..cae77a11 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,13 @@ build_stacker = go build $1 -tags "$(BUILD_TAGS) $2" -ldflags "-X main.version=$
 # See doc/hacking.md for how to use a local oci or docker repository.
 STACKER_DOCKER_BASE?=docker://ghcr.io/project-stacker/
 # They default to their image name in STACKER_DOCKER_BASE
-STACKER_BUILD_BASE_IMAGE?=$(STACKER_DOCKER_BASE)alpine:edge
+STACKER_BUILD_BASE_IMAGE?=$(STACKER_BUILD_ALPINE_IMAGE)
+STACKER_BUILD_ALPINE_IMAGE?=$(STACKER_DOCKER_BASE)alpine:edge
 STACKER_BUILD_BUSYBOX_IMAGE?=$(STACKER_DOCKER_BASE)busybox:latest
 STACKER_BUILD_CENTOS_IMAGE?=$(STACKER_DOCKER_BASE)centos:latest
 STACKER_BUILD_UBUNTU_IMAGE?=$(STACKER_DOCKER_BASE)ubuntu:latest
 STACKER_BUILD_IMAGES = \
+	$(STACKER_BUILD_ALPINE_IMAGE) \
 	$(STACKER_BUILD_BASE_IMAGE) \
 	$(STACKER_BUILD_BUSYBOX_IMAGE) \
 	$(STACKER_BUILD_CENTOS_IMAGE) \
@@ -149,7 +151,7 @@ test: stacker $(REGCLIENT) $(SKOPEO) $(ZOT)
 	sudo -E PATH="$$PATH" \
 		LXC_BRANCH=$(LXC_BRANCH) \
 		LXC_CLONE_URL=$(LXC_CLONE_URL) \
-		STACKER_BUILD_BASE_IMAGE=$(STACKER_BUILD_BASE_IMAGE) \
+		STACKER_BUILD_ALPINE_IMAGE=$(STACKER_BUILD_ALPINE_IMAGE) \
 		STACKER_BUILD_BUSYBOX_IMAGE=$(STACKER_BUILD_BUSYBOX_IMAGE) \
 		STACKER_BUILD_CENTOS_IMAGE=$(STACKER_BUILD_CENTOS_IMAGE) \
 		STACKER_BUILD_UBUNTU_IMAGE=$(STACKER_BUILD_UBUNTU_IMAGE) \
@@ -166,7 +168,8 @@ test-cov: stacker-cov $(REGCLIENT) $(SKOPEO) $(ZOT)
 		-E GOCOVERDIR="$$GOCOVERDIR" \
 		LXC_BRANCH=$(LXC_BRANCH) \
 		LXC_CLONE_URL=$(LXC_CLONE_URL) \
-		STACKER_BUILD_BASE_IMAGE=$(STACKER_BUILD_BASE_IMAGE) \
+		STACKER_BUILD_ALPINE_IMAGE=$(STACKER_BUILD_ALPINE_IMAGE) \
+		STACKER_BUILD_BUSYBOX_IMAGE=$(STACKER_BUILD_BUSYBOX_IMAGE) \
 		STACKER_BUILD_CENTOS_IMAGE=$(STACKER_BUILD_CENTOS_IMAGE) \
 		STACKER_BUILD_UBUNTU_IMAGE=$(STACKER_BUILD_UBUNTU_IMAGE) \
 		./test/main.py \
diff --git a/test/bom.bats b/test/bom.bats
index 534f6990..e00e6134 100644
--- a/test/bom.bats
+++ b/test/bom.bats
@@ -160,8 +160,8 @@ EOF
   cat > stacker.yaml <<EOF
 bom-alpine:
   from:
-    type: docker
-    url: docker://ghcr.io/project-stacker/alpine:edge
+    type: oci
+    url: $ALPINE_OCI
   bom:
     generate: true
     packages:
diff --git a/test/helpers.bash b/test/helpers.bash
index 8a8ee885..6af84ffb 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -51,6 +51,7 @@ STACKER_BUILD_UBUNTU_IMAGE=${STACKER_BUILD_UBUNTU_IMAGE:-${STACKER_DOCKER_BASE}u
 ) 9<$ROOT_DIR/test/main.py
 export BUSYBOX_OCI="$ROOT_DIR/test/busybox:latest"
 export CENTOS_OCI="$ROOT_DIR/test/centos:latest"
+export ALPINE_OCI="$ROOT_DIR/test/alpine:edge"
 export UBUNTU_OCI="$ROOT_DIR/test/ubuntu:latest"
 export PATH="$PATH:$ROOT_DIR/hack/tools/bin"