build: retry PPA upload up to three times (#31099)

fjl · web-flow · commit 7d0e197def6d · 2025-01-30T14:06:50.000+01:00
diff --git a/build/ci.go b/build/ci.go
@@ -883,11 +883,17 @@ func ppaUpload(workdir, ppa, sshUser string, files []string) {
 			os.WriteFile(idfile, sshkey, 0600)
 		}
 	}
-	// Upload
+	// Upload. This doesn't always work, so try up to three times.
 	dest := sshUser + "@ppa.launchpad.net"
-	if err := build.UploadSFTP(idfile, dest, incomingDir, files); err != nil {
-		log.Fatal(err)
+	for i := 0; i < 3; i++ {
+		err := build.UploadSFTP(idfile, dest, incomingDir, files)
+		if err == nil {
+			return
+		}
+		log.Println("PPA upload failed:", err)
+		time.Sleep(5 * time.Second)
 	}
+	log.Fatal("PPA upload failed all attempts.")
 }
 
 func getenvBase64(variable string) []byte {

Original file line number	Diff line number	Diff line change
`@@ -883,11 +883,17 @@ func ppaUpload(workdir, ppa, sshUser string, files []string) {`
`883`	`883`	`os.WriteFile(idfile, sshkey, 0600)`
`884`	`884`	`}`
`885`	`885`	`}`
`886`		`- // Upload`
	`886`	`+ // Upload. This doesn't always work, so try up to three times.`
`887`	`887`	`dest := sshUser + "@ppa.launchpad.net"`
`888`		`- if err := build.UploadSFTP(idfile, dest, incomingDir, files); err != nil {`
`889`		`- log.Fatal(err)`
	`888`	`+ for i := 0; i < 3; i++ {`
	`889`	`+ err := build.UploadSFTP(idfile, dest, incomingDir, files)`
	`890`	`+ if err == nil {`
	`891`	`+ return`
	`892`	`+ }`
	`893`	`+ log.Println("PPA upload failed:", err)`
	`894`	`+ time.Sleep(5 * time.Second)`
`890`	`895`	`}`
	`896`	`+ log.Fatal("PPA upload failed all attempts.")`
`891`	`897`	`}`
`892`	`898`
`893`	`899`	`func getenvBase64(variable string) []byte {`