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

fjl · fjl · commit db93d4988073 · 2025-01-30T14:12:09.000+01:00
diff --git a/build/ci.go b/build/ci.go
@@ -888,11 +888,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
`@@ -888,11 +888,17 @@ func ppaUpload(workdir, ppa, sshUser string, files []string) {`
`888`	`888`	`os.WriteFile(idfile, sshkey, 0600)`
`889`	`889`	`}`
`890`	`890`	`}`
`891`		`- // Upload`
	`891`	`+ // Upload. This doesn't always work, so try up to three times.`
`892`	`892`	`dest := sshUser + "@ppa.launchpad.net"`
`893`		`- if err := build.UploadSFTP(idfile, dest, incomingDir, files); err != nil {`
`894`		`- log.Fatal(err)`
	`893`	`+ for i := 0; i < 3; i++ {`
	`894`	`+ err := build.UploadSFTP(idfile, dest, incomingDir, files)`
	`895`	`+ if err == nil {`
	`896`	`+ return`
	`897`	`+ }`
	`898`	`+ log.Println("PPA upload failed:", err)`
	`899`	`+ time.Sleep(5 * time.Second)`
`895`	`900`	`}`
	`901`	`+ log.Fatal("PPA upload failed all attempts.")`
`896`	`902`	`}`
`897`	`903`
`898`	`904`	`func getenvBase64(variable string) []byte {`