From b292455781912d8ced706113619385700d3e488d Mon Sep 17 00:00:00 2001 From: Devanshu Date: Sat, 7 Sep 2024 11:17:08 +0530 Subject: [PATCH] Remove cloudfoundry/capi-kpack-watcher image from tests adjust expectedPackagedSHA accordingly Signed-off-by: Devanshu --- go.mod | 2 -- test/e2e/packaging_test.go | 5 +---- test/e2e/relocate_test.go | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 8fe024e2..08466aee 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/vmware-tanzu/carvel-kbld go 1.22 -toolchain go1.22.5 - require ( carvel.dev/imgpkg v0.40.2 carvel.dev/vendir v0.39.2 diff --git a/test/e2e/packaging_test.go b/test/e2e/packaging_test.go index 5e117fd5..70939baa 100644 --- a/test/e2e/packaging_test.go +++ b/test/e2e/packaging_test.go @@ -178,9 +178,6 @@ overrides: - image: cfidentity/uaa@sha256:9f1e7e399c96309935145624d1824b2c2bf93656fd9c4dcf1c593b55f98aa6a8 newImage: index.docker.io/cfidentity/uaa@sha256:9f1e7e399c96309935145624d1824b2c2bf93656fd9c4dcf1c593b55f98aa6a8 preresolved: true -- image: cloudfoundry/capi-kpack-watcher:956150dae0a95dcdf3c1f29c23c3bf11db90f7a0@sha256:67125e0d3a4026a23342d80e09aad9284c08ab4f7b3d9a993ae66e403d5d0796 - newImage: index.docker.io/cloudfoundry/capi-kpack-watcher@sha256:67125e0d3a4026a23342d80e09aad9284c08ab4f7b3d9a993ae66e403d5d0796 - preresolved: true - image: cloudfoundry/capi:nginx@sha256:51e4e48c457d5cb922cf0f569e145054e557e214afa78fb2b312a39bb2f938b6 newImage: index.docker.io/cloudfoundry/capi@sha256:51e4e48c457d5cb922cf0f569e145054e557e214afa78fb2b312a39bb2f938b6 preresolved: true @@ -252,7 +249,7 @@ overrides: preresolved: true ` - expectedPackagedSHA := "9d2f9e15541d6c136c28cc10e0e469f6a8b48876" + expectedPackagedSHA := "e2c66f42fdac6993741440ba157fe4fb3f505eb3" path := "/tmp/kbld-test-pkg-unpkg-successful-with-many-images" defer os.RemoveAll(path) diff --git a/test/e2e/relocate_test.go b/test/e2e/relocate_test.go index 5cf53310..3acea9cf 100644 --- a/test/e2e/relocate_test.go +++ b/test/e2e/relocate_test.go @@ -57,7 +57,6 @@ func TestRelocateSuccessfulWithManyImages(t *testing.T) { kind: Object spec: - image: index.docker.io/cfidentity/uaa@sha256:9f1e7e399c96309935145624d1824b2c2bf93656fd9c4dcf1c593b55f98aa6a8 -- image: index.docker.io/cloudfoundry/capi-kpack-watcher@sha256:67125e0d3a4026a23342d80e09aad9284c08ab4f7b3d9a993ae66e403d5d0796 - image: index.docker.io/cloudfoundry/capi@sha256:51e4e48c457d5cb922cf0f569e145054e557e214afa78fb2b312a39bb2f938b6 - image: index.docker.io/cloudfoundry/cloud-controller-ng@sha256:374f967edd7db4d7efc2f38cb849988aa36a8248dd240d56f49484b8159fd800 - image: index.docker.io/cloudfoundry/cnb@sha256:5b03a853e636b78c44e475bbc514e2b7b140cc41cca8ab907e9753431ae8c0b0 @@ -91,7 +90,6 @@ spec: kind: Object spec: - image: index.docker.io/*username*/kbld-test-relocate-successful-with-many-images@sha256:9f1e7e399c96309935145624d1824b2c2bf93656fd9c4dcf1c593b55f98aa6a8 -- image: index.docker.io/*username*/kbld-test-relocate-successful-with-many-images@sha256:67125e0d3a4026a23342d80e09aad9284c08ab4f7b3d9a993ae66e403d5d0796 - image: index.docker.io/*username*/kbld-test-relocate-successful-with-many-images@sha256:51e4e48c457d5cb922cf0f569e145054e557e214afa78fb2b312a39bb2f938b6 - image: index.docker.io/*username*/kbld-test-relocate-successful-with-many-images@sha256:374f967edd7db4d7efc2f38cb849988aa36a8248dd240d56f49484b8159fd800 - image: index.docker.io/*username*/kbld-test-relocate-successful-with-many-images@sha256:5b03a853e636b78c44e475bbc514e2b7b140cc41cca8ab907e9753431ae8c0b0