From 33ef48f8b47710cd4360c5a97f867c4883d199a6 Mon Sep 17 00:00:00 2001 From: Arjun Sreedharan Date: Thu, 25 Apr 2024 14:57:51 +0000 Subject: [PATCH] tests/watchexec: direct image instead of occam packager See paketo-buildpacks/libpak#321, create-package is not able to support multiarch buildpacks and watchexec was just released multiarch --- integration.json | 2 +- integration/init_test.go | 4 +--- integration/simple_app_test.go | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/integration.json b/integration.json index 05d5dab1..1379237c 100644 --- a/integration.json +++ b/integration.json @@ -4,5 +4,5 @@ "index.docker.io/paketobuildpacks/builder-jammy-buildpackless-base:latest" ], "build-plan": "github.com/paketo-community/build-plan", - "watchexec": "github.com/paketo-buildpacks/watchexec" + "watchexec": "index.docker.io/paketobuildpacks/watchexec" } diff --git a/integration/init_test.go b/integration/init_test.go index 09335528..f4116a83 100644 --- a/integration/init_test.go +++ b/integration/init_test.go @@ -76,9 +76,7 @@ func TestIntegration(t *testing.T) { Execute(root) Expect(err).NotTo(HaveOccurred()) - settings.Buildpacks.Watchexec.Online, err = libpakBuildpackStore.Get. - Execute(settings.Config.Watchexec) - Expect(err).ToNot(HaveOccurred()) + settings.Buildpacks.Watchexec.Online = settings.Config.Watchexec settings.Buildpacks.BuildPlan.Online, err = libpakBuildpackStore.Get. Execute(settings.Config.BuildPlan) diff --git a/integration/simple_app_test.go b/integration/simple_app_test.go index beabe4a0..d4dce1c6 100644 --- a/integration/simple_app_test.go +++ b/integration/simple_app_test.go @@ -184,7 +184,7 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) { settings.Buildpacks.Watchexec.Online, settings.Buildpacks.NGINX.Online, ). - WithPullPolicy("never"). + WithPullPolicy("if-not-present"). WithEnv(map[string]string{ "BP_LIVE_RELOAD_ENABLED": "true", }). @@ -235,7 +235,7 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) { settings.Buildpacks.Watchexec.Online, settings.Buildpacks.NGINX.Online, ). - WithPullPolicy("never"). + WithPullPolicy("if-not-present"). WithEnv(map[string]string{ "BP_LIVE_RELOAD_ENABLED": "not-a-bool", }).