chore(test): update busybox acceptance test (#325)

Signed-off-by: Benji Visser <[email protected]>
xeol-io · Apr 4, 2024 · e3c3acc · e3c3acc
1 parent 71d335a
commit e3c3acc
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/test/install/Makefile b/test/install/Makefile
@@ -3,7 +3,7 @@ NAME=xeol
 IMAGE_NAME=$(NAME)-install.sh-env
 UBUNTU_IMAGE=$(IMAGE_NAME):ubuntu-20.04
 ALPINE_IMAGE=$(IMAGE_NAME):alpine-3.6
-BUSYBOX_IMAGE=busybox:1.35
+BUSYBOX_IMAGE=busybox:1.36.1-musl
 
 ENVS=./environments
 DOCKER_RUN=docker run --rm -t -w /project/test/install -v $(shell pwd)/../../:/project
@@ -32,7 +32,7 @@ ci-test-mac: unit-local acceptance-local
 
 # note: do not add acceptance-local to this list
 .PHONY: acceptance
-acceptance: acceptance-ubuntu-20.04 acceptance-alpine-3.6 acceptance-busybox-1.35
+acceptance: acceptance-ubuntu-20.04 acceptance-alpine-3.6 acceptance-busybox
 
 .PHONY: unit
 unit: unit-ubuntu-20.04
@@ -55,17 +55,15 @@ acceptance-previous-release-local:
 	xeol version | grep $(shell echo $(PREVIOUS_RELEASE)| tr -d "v")
 
 .PHONY: save
-save: ubuntu-20.04 alpine-3.6 busybox-1.35
+save: ubuntu-20.04 alpine-3.6 pull-busybox
 	@mkdir cache || true
 	docker image save -o cache/ubuntu-env.tar $(UBUNTU_IMAGE)
 	docker image save -o cache/alpine-env.tar $(ALPINE_IMAGE)
-	docker image save -o cache/busybox-env.tar $(BUSYBOX_IMAGE)
 
 .PHONY: load
 load:
 	docker image load -i cache/ubuntu-env.tar
 	docker image load -i cache/alpine-env.tar
-	docker image load -i cache/busybox-env.tar
 
 ## UBUNTU #######################################################
 
@@ -107,16 +105,16 @@ alpine-3.6:
 
 # note: busybox by default will not have cacerts, so you will get TLS warnings (we want to test under these conditions)
 
-.PHONY: acceptance-busybox-1.35
-acceptance-busybox-1.35: busybox-1.35
-	$(call title,busybox-1.35 - acceptance)
+.PHONY: acceptance-busybox
+acceptance-busybox: pull-busybox
+	$(call title,busybox - acceptance)
 	$(DOCKER_RUN) $(BUSYBOX_IMAGE) \
 		$(ACCEPTANCE_CMD)
 	@echo "\n*** test note: you should see xeol spit out a 'x509: certificate signed by unknown authority' error --this is expected ***"
 
-.PHONY: busybox-1.35
-busybox-1.35:
-	$(call title,busybox-1.35 - build environment)
+.PHONY: pull-busybox
+pull-busybox:
+	$(call title,busybox - build environment)
 	docker pull $(BUSYBOX_IMAGE)
 
 ## For CI ########################################################