Remove raw image on rebuild

RELEASE_NOTES.md

@@ -10,6 +10,7 @@
 
 * [#319](https://github.com/suse-edge/edge-image-builder/issues/319) - Combustion fails when combustion directory content is larger than half of the RAM of the system
 * [#233](https://github.com/suse-edge/edge-image-builder/issues/233) - Use different Helm chart sources for development and production builds
+* [#337](https://github.com/suse-edge/edge-image-builder/issues/337) - Re-running raw builds should remove the previous built image
 * [#95](https://github.com/suse-edge/edge-image-builder/issues/95) - Compressed images are not supported
 
 ---

pkg/build/build.go

@@ -69,6 +69,15 @@ func (b *Builder) generateBaseImageFilename() string {
 	return filename
 }
 
+func (b *Builder) deleteExistingOutputImage() error {
+	outputFilename := b.generateOutputImageFilename()
+	err := os.Remove(outputFilename)
+	if err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("error deleting file %s: %w", outputFilename, err)
+	}
+	return nil
+}
+
 func SetupBuildDirectory(rootDir string) (string, error) {
 	timestamp := time.Now().Format("Jan02_15-04-05")
 	buildDir := filepath.Join(rootDir, fmt.Sprintf("build-%s", timestamp))

pkg/build/build_test.go

@@ -80,3 +80,58 @@ func TestGenerateBuildDirFilename(t *testing.T) {
 	expectedFilename := filepath.Join(builder.context.BuildDir, testFilename)
 	require.Equal(t, expectedFilename, filename)
 }
+
+func TestDeleteNoExistingImage(t *testing.T) {
+	// Setup
+	tmpDir, err := os.MkdirTemp("", "eib-")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpDir)
+
+	builder := Builder{
+		context: &image.Context{
+			ImageConfigDir: tmpDir,
+			ImageDefinition: &image.Definition{
+				Image: image.Image{
+					OutputImageName: "not-there",
+				},
+			},
+		},
+	}
+
+	// Test
+	err = builder.deleteExistingOutputImage()
+
+	// Verify
+	require.NoError(t, err)
+}
+
+func TestDeleteExistingImage(t *testing.T) {
+	// Setup
+	tmpDir, err := os.MkdirTemp("", "eib-")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpDir)
+
+	builder := Builder{
+		context: &image.Context{
+			ImageConfigDir: tmpDir,
+			ImageDefinition: &image.Definition{
+				Image: image.Image{
+					OutputImageName: "not-there",
+				},
+			},
+		},
+	}
+
+	_, err = os.Create(builder.generateOutputImageFilename())
+	require.NoError(t, err)
+
+	// Test
+	err = builder.deleteExistingOutputImage()
+
+	// Verify
+	require.NoError(t, err)
+
+	_, err = os.Stat(builder.generateOutputImageFilename())
+	require.Error(t, err)
+	require.True(t, os.IsNotExist(err))
+}

pkg/build/iso.go

@@ -29,7 +29,7 @@ var extractIsoTemplate string
 var rebuildIsoTemplate string
 
 func (b *Builder) buildIsoImage() error {
-	if err := b.deleteExistingOutputIso(); err != nil {
+	if err := b.deleteExistingOutputImage(); err != nil {
 		return fmt.Errorf("deleting existing ISO image: %w", err)
 	}
 
@@ -96,15 +96,6 @@ func (b *Builder) rebuildIso() error {
 	return nil
 }
 
-func (b *Builder) deleteExistingOutputIso() error {
-	outputFilename := b.generateOutputImageFilename()
-	err := os.Remove(outputFilename)
-	if err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("error deleting file %s: %w", outputFilename, err)
-	}
-	return nil
-}
-
 func (b *Builder) writeIsoScript(templateContents, outputFilename string) error {
 	scriptName := filepath.Join(b.context.BuildDir, outputFilename)
 	isoExtractPath := filepath.Join(b.context.BuildDir, isoExtractDir)

pkg/build/iso_test.go

@@ -38,61 +38,6 @@ func setupContext(t *testing.T) (ctx *image.Context, teardown func()) {
 	}
 }
 
-func TestDeleteNoExistingImage(t *testing.T) {
-	// Setup
-	tmpDir, err := os.MkdirTemp("", "eib-")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpDir)
-
-	builder := Builder{
-		context: &image.Context{
-			ImageConfigDir: tmpDir,
-			ImageDefinition: &image.Definition{
-				Image: image.Image{
-					OutputImageName: "not-there",
-				},
-			},
-		},
-	}
-
-	// Test
-	err = builder.deleteExistingOutputIso()
-
-	// Verify
-	require.NoError(t, err)
-}
-
-func TestDeleteExistingImage(t *testing.T) {
-	// Setup
-	tmpDir, err := os.MkdirTemp("", "eib-")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpDir)
-
-	builder := Builder{
-		context: &image.Context{
-			ImageConfigDir: tmpDir,
-			ImageDefinition: &image.Definition{
-				Image: image.Image{
-					OutputImageName: "not-there",
-				},
-			},
-		},
-	}
-
-	_, err = os.Create(builder.generateOutputImageFilename())
-	require.NoError(t, err)
-
-	// Test
-	err = builder.deleteExistingOutputIso()
-
-	// Verify
-	require.NoError(t, err)
-
-	_, err = os.Stat(builder.generateOutputImageFilename())
-	require.Error(t, err)
-	require.True(t, os.IsNotExist(err))
-}
-
 func TestWriteIsoScript_Extract(t *testing.T) {
 	// Setup
 	ctx, teardown := setupContext(t)

pkg/build/raw.go

@@ -23,6 +23,10 @@ const (
 var modifyRawImageTemplate string
 
 func (b *Builder) buildRawImage() error {
+	if err := b.deleteExistingOutputImage(); err != nil {
+		return fmt.Errorf("deleting existing RAW image: %w", err)
+	}
+
 	cmd := b.createRawImageCopyCommand()
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("copying the base image %s to the output image location %s: %w",