From 6434bb075d2cc2c52e1acbc371f7234b8c71e614 Mon Sep 17 00:00:00 2001 From: dwillist Date: Thu, 23 Jul 2020 11:26:49 -0400 Subject: [PATCH 1/3] run set image mirror test sequentially, - reduces flakes that result from gouroutines sharing environment variables Signed-off-by: dwillist --- internal/commands/set_run_image_mirrors_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/commands/set_run_image_mirrors_test.go b/internal/commands/set_run_image_mirrors_test.go index d54f0b831..639179d72 100644 --- a/internal/commands/set_run_image_mirrors_test.go +++ b/internal/commands/set_run_image_mirrors_test.go @@ -18,7 +18,7 @@ import ( ) func TestSetRunImageMirrorsCommand(t *testing.T) { - spec.Run(t, "Commands", testSetRunImageMirrorsCommand, spec.Parallel(), spec.Report(report.Terminal{})) + spec.Run(t, "Commands", testSetRunImageMirrorsCommand, spec.Sequential(), spec.Report(report.Terminal{})) } func testSetRunImageMirrorsCommand(t *testing.T, when spec.G, it spec.S) { From bd59022e6ce7532c10388b99ede2780e746a2b67 Mon Sep 17 00:00:00 2001 From: dwillist Date: Thu, 23 Jul 2020 11:43:09 -0400 Subject: [PATCH 2/3] failing on 'should add lifecycle symlink' assertion Signed-off-by: dwillist --- internal/builder/builder.go | 9 --------- internal/builder/builder_test.go | 16 +++++++++------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/internal/builder/builder.go b/internal/builder/builder.go index 1a559e3d3..835683d2c 100644 --- a/internal/builder/builder.go +++ b/internal/builder/builder.go @@ -703,15 +703,6 @@ func (b *Builder) lifecycleLayer(dest string) (string, error) { return "", errors.Wrap(err, "embedding lifecycle tar") } - if err := lw.WriteHeader(&tar.Header{ - Name: compatLifecycleDir, - Linkname: lifecycleDir, - Typeflag: tar.TypeSymlink, - Mode: 0644, - ModTime: archive.NormalizedDateTime, - }); err != nil { - return "", errors.Wrapf(err, "creating %s symlink", style.Symbol(compatLifecycleDir)) - } return fh.Name(), nil } diff --git a/internal/builder/builder_test.go b/internal/builder/builder_test.go index 759abb79e..6322ef1a0 100644 --- a/internal/builder/builder_test.go +++ b/internal/builder/builder_test.go @@ -589,14 +589,16 @@ func testBuilder(t *testing.T, when spec.G, it spec.S) { h.HasFileMode(0755), h.HasModTime(archive.NormalizedDateTime), ) + }) - it("should add lifecycle symlink", func() { - h.AssertOnTarEntry(t, layerTar, "/lifecycle", - h.SymlinksTo("/cnb/lifecycle"), - h.HasFileMode(0644), - h.HasModTime(archive.NormalizedDateTime), - ) - }) + it("should add lifecycle symlink", func() { + layerTar, err := baseImage.FindLayerWithPath("/cnb/lifecycle") + h.AssertNil(t, err) + h.AssertOnTarEntry(t, layerTar, "/lifecycle", + h.SymlinksTo("/cnb/lifecycle"), + h.HasFileMode(0644), + h.HasModTime(archive.NormalizedDateTime), + ) }) it("sets the lifecycle version on the metadata", func() { From 5b6731320073fe1451f440ac93c27edf2f792a2a Mon Sep 17 00:00:00 2001 From: dwillist Date: Thu, 23 Jul 2020 11:45:04 -0400 Subject: [PATCH 3/3] remove lifecycle symlink test, update formatting Signed-off-by: dwillist --- internal/builder/builder.go | 14 ++++++-------- internal/builder/builder_test.go | 10 ---------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/internal/builder/builder.go b/internal/builder/builder.go index 835683d2c..cbf498f40 100644 --- a/internal/builder/builder.go +++ b/internal/builder/builder.go @@ -32,13 +32,12 @@ const ( cnbDir = "/cnb" - orderPath = "/cnb/order.toml" - stackPath = "/cnb/stack.toml" - platformDir = "/platform" - lifecycleDir = "/cnb/lifecycle" - compatLifecycleDir = "/lifecycle" - workspaceDir = "/workspace" - layersDir = "/layers" + orderPath = "/cnb/order.toml" + stackPath = "/cnb/stack.toml" + platformDir = "/platform" + lifecycleDir = "/cnb/lifecycle" + workspaceDir = "/workspace" + layersDir = "/layers" metadataLabel = "io.buildpacks.builder.metadata" stackLabel = "io.buildpacks.stack.id" @@ -703,6 +702,5 @@ func (b *Builder) lifecycleLayer(dest string) (string, error) { return "", errors.Wrap(err, "embedding lifecycle tar") } - return fh.Name(), nil } diff --git a/internal/builder/builder_test.go b/internal/builder/builder_test.go index 6322ef1a0..292b0dd18 100644 --- a/internal/builder/builder_test.go +++ b/internal/builder/builder_test.go @@ -591,16 +591,6 @@ func testBuilder(t *testing.T, when spec.G, it spec.S) { ) }) - it("should add lifecycle symlink", func() { - layerTar, err := baseImage.FindLayerWithPath("/cnb/lifecycle") - h.AssertNil(t, err) - h.AssertOnTarEntry(t, layerTar, "/lifecycle", - h.SymlinksTo("/cnb/lifecycle"), - h.HasFileMode(0644), - h.HasModTime(archive.NormalizedDateTime), - ) - }) - it("sets the lifecycle version on the metadata", func() { label, err := baseImage.Label("io.buildpacks.builder.metadata") h.AssertNil(t, err)