Merge pull request #157 from canonical/eatmydata

FR-5720 - Use eatmydata for germinate and debootstrap
canonical · Oct 30, 2023 · ffc4b13 · ffc4b13
2 parents ffca56b + 8004b5a
commit ffc4b13
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -16,7 +16,7 @@ jobs:
       - name: apt-update
         run: sudo apt update
       - name: install-test-dependencies
-        run: sudo apt install -y snapd germinate mtools debootstrap fdisk gdisk qemu-system-aarch64 qemu-user-static ubuntu-dev-tools
+        run: sudo apt install -y snapd germinate mtools debootstrap eatmydata fdisk gdisk qemu-system-aarch64 qemu-user-static ubuntu-dev-tools
       - name: test
         run: sudo go test -timeout 0 -v -race -coverprofile=coverage.out -covermode=atomic ./...
       - name: Upload coverage to Codecov

diff --git a/debian/changelog b/debian/changelog
@@ -36,6 +36,7 @@ ubuntu-image (3.0+23.04ubuntu1) UNRELEASED; urgency=medium
   * Make sure the fstab file is cleanly overridden (LP: #2031889)
   * Always look for gadget.yaml file in meta directory
   * Add a make-dirs manual customization option to create directories in the rootfs
+  * use eatmydata to speed up debootstrap
 
   [ Alfonso Sanchez-Beato ]
   * Update to latest snapd, adapting to changes in layouts code.

diff --git a/debian/control b/debian/control
@@ -20,6 +20,7 @@ Built-Using: ${misc:Built-Using},
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          debootstrap,
+         eatmydata,
          dosfstools,
          fdisk,
          gdisk,

diff --git a/internal/statemachine/classic_test.go b/internal/statemachine/classic_test.go
@@ -3259,6 +3259,8 @@ func TestCreateChroot(t *testing.T) {
 		err := stateMachine.makeTemporaryDirectories()
 		asserter.AssertErrNil(err, true)
 
+		t.Cleanup(func() { os.RemoveAll(stateMachine.stateMachineFlags.WorkDir) })
+
 		err = stateMachine.createChroot()
 		asserter.AssertErrNil(err, true)
 
@@ -3310,7 +3312,6 @@ func TestCreateChroot(t *testing.T) {
 				t.Errorf("%s is not present in /etc/apt/sources.list", pocket)
 			}
 		}
-		os.RemoveAll(stateMachine.stateMachineFlags.WorkDir)
 	})
 }
 

diff --git a/internal/statemachine/helper.go b/internal/statemachine/helper.go
@@ -562,7 +562,9 @@ func generateGerminateCmd(imageDefinition imagedefinition.ImageDefinition) *exec
 
 	seedSource := strings.Join(imageDefinition.Rootfs.Seed.SeedURLs, ",")
 
-	germinateCmd := execCommand("germinate",
+	germinateCmd := execCommand(
+		"eatmydata",
+		"germinate",
 		"--mirror", imageDefinition.Rootfs.Mirror,
 		"--arch", imageDefinition.Architecture,
 		"--dist", imageDefinition.Series,
@@ -608,7 +610,8 @@ func cloneGitRepo(imageDefinition imagedefinition.ImageDefinition, workDir strin
 // generateDebootstrapCmd generates the debootstrap command used to create a chroot
 // environment that will eventually become the rootfs of the resulting image
 func generateDebootstrapCmd(imageDefinition imagedefinition.ImageDefinition, targetDir string, includeList []string) *exec.Cmd {
-	debootstrapCmd := execCommand("debootstrap",
+	debootstrapCmd := execCommand("eatmydata",
+		"debootstrap",
 		"--arch", imageDefinition.Architecture,
 		"--variant=minbase",
 	)

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -39,6 +39,7 @@ parts:
       - gdisk
       - fakeroot
       - debootstrap
+      - eatmydata
       - gpg
       - germinate
       - mtools