Split update && upgrade apt calls to avoid timeout

Author: denisonbarbosa

e2e/cmd/build_base_image/01_prepare_base_vm/main.go

@@ -140,21 +140,34 @@ func action(ctx context.Context, cmd *command.Command) error {
 
 	// Install required dependencies
 	log.Infof("Installing eatmydata to speed up package installation...")
-	if _, err := client.Run(ctx, `echo force-unsafe-io | sudo tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io && \
-sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y eatmydata`); err != nil {
+	if _, err := client.Run(ctx, "echo force-unsafe-io | sudo tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io"); err != nil {
+		return fmt.Errorf("failed to install required packages: %w", err)
+	}
+
+	if _, err := client.Run(ctx, "sudo apt-get update"); err != nil {
+		return fmt.Errorf("failed to update packages: %w", err)
+	}
+
+	if _, err := client.Run(ctx, "sudo DEBIAN_FRONTEND=noninteractive apt-get install -y eatmydata"); err != nil {
 		return fmt.Errorf("failed to set up eatmydata: %w", err)
 	}
 
 	log.Infof("Installing required packages on VM...")
-	if _, err := client.Run(ctx, `echo force-unsafe-io | sudo tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io && \
-sudo eatmydata apt-get update && sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get upgrade -y && \
-sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y ubuntu-desktop realmd nfs-common cifs-utils && \
-sudo sync && \
-sudo rm -f /etc/dpkg/dpkg.cfg.d/force-unsafe-io
-`); err != nil {
+	_, err = client.Run(ctx, "sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get upgrade -y")
+	if err != nil {
+		return fmt.Errorf("failed to update packages: %w", err)
+	}
+
+	_, err = client.Run(ctx, "sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -y ubuntu-desktop realmd nfs-common cifs-utils")
+	if err != nil {
 		return fmt.Errorf("failed to install required packages: %w", err)
 	}
 
+	_, err = client.Run(ctx, "sudo sync && sudo rm -f /etc/dpkg/dpkg.cfg.d/force-unsafe-io")
+	if err != nil {
+		return fmt.Errorf("failed to clean up eatmydata: %w", err)
+	}
+
 	scriptsDir, err := scripts.Dir()
 	if err != nil {
 		return fmt.Errorf("failed to get scripts directory: %w", err)

e2e/cmd/run_tests/01_provision_client/main.go

@@ -176,22 +176,27 @@ func action(ctx context.Context, cmd *command.Command) error {
 		}
 	}
 
-	log.Infof("Upgrading packages...")
-	_, err = client.Run(ctx, "apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade")
+	log.Infof("Updating and upgrading packages...")
+	_, err = client.Run(ctx, "DEBIAN_FRONTEND=noninteractive apt update")
 	if err != nil {
 		return fmt.Errorf("failed to update package list: %w", err)
 	}
 
+	_, err = client.Run(ctx, "DEBIAN_FRONTEND=noninteractive apt upgrade -y")
+	if err != nil {
+		return fmt.Errorf("failed to upgrade packages: %w", err)
+	}
+
 	log.Infof("Installing adsys package...")
-	_, err = client.Run(ctx, "DEBIAN_FRONTEND=noninteractive apt-get install -y /debs/*.deb")
+	_, err = client.Run(ctx, "DEBIAN_FRONTEND=noninteractive apt install /debs/*.deb -y")
 	if err != nil {
 		return fmt.Errorf("failed to install adsys package: %w", err)
 	}
 
 	// TODO: remove this once the packages installed below are MIRed and installed by default with adsys
 	// Allow errors here on account on packages not being available on the tested Ubuntu version
 	log.Infof("Installing universe packages required for some policy managers...")
-	if _, err := client.Run(ctx, "DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-proxy-manager python3-cepces"); err != nil {
+	if _, err := client.Run(ctx, "DEBIAN_FRONTEND=noninteractive apt install ubuntu-proxy-manager python3-cepces -y"); err != nil {
 		log.Warningf("Some packages failed to install: %v", err)
 	}