REVERTME: Test Windows failure

Signed-off-by: Natalie Arellano <narellano@vmware.com>

layout/layout_test.go

@@ -257,7 +257,7 @@ func testImage(t *testing.T, when spec.G, it spec.S) {
 			})
 
 			when("existing config has extra fields", func() {
-				it("returns an unmodified digest", func() {
+				it.Focus("returns an unmodified digest", func() {
 					img, err := layout.NewImage(imagePath, layout.FromBaseImagePath(filepath.Join("testdata", "layout", "busybox-latest")))
 					h.AssertNil(t, err)
 					digest, err := img.Digest()

layout/new.go

@@ -23,13 +23,17 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 		if err != nil {
 			return nil, err
 		}
+		digest, _ := options.BaseImage.Digest()
+		fmt.Println("XXX Orig", digest)
 	}
 	options.MediaTypes = imgutil.GetPreferredMediaTypes(*options)
 	if options.BaseImage != nil {
 		options.BaseImage, err = newImageFacadeFrom(options.BaseImage, options.MediaTypes)
 		if err != nil {
 			return nil, err
 		}
+		digest, _ := options.BaseImage.Digest()
+		fmt.Println("XXX Facade", digest)
 	}
 
 	if options.PreviousImageRepoName != "" {
@@ -50,6 +54,9 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 		return nil, err
 	}
 
+	manifest, _ := cnbImage.RawManifest()
+	fmt.Println("XXX Manifest: ", string(manifest))
+
 	return &Image{
 		CNBImageCore:      cnbImage,
 		repoPath:          path,

new.go

@@ -258,6 +258,7 @@ func NormalizedHistory(history []v1.History, nLayers int) []v1.History {
 }
 
 func prepareNewWindowsImageIfNeeded(image *CNBImageCore) error {
+	fmt.Println("XXX Preparing new Windows image...")
 	configFile, err := getConfigFile(image)
 	if err != nil {
 		return err