Merge pull request #2020 from williamjallen/3.2-to-3.3-for-rc2

Merge patches from 3.2 into 3.3

Author: williamjallen

app/Jobs/ProcessSubmission.php

@@ -94,7 +94,14 @@ private function requeueSubmissionFile($buildid): bool
             // Requeue the file with exponential backoff.
             PendingSubmissions::IncrementForBuildId($this->buildid);
             $delay = pow(config('cdash.retry_base'), $retry_handler->Retries);
-            self::dispatch($this->filename, $this->projectid, $buildid, md5_file(Storage::path("inbox/{$this->filename}")))->delay(now()->addSeconds($delay));
+            if (config('queue.default') === 'sqs-fifo') {
+                // Special handling for sqs-fifo, which does not support per-message delays.
+                sleep(10);
+                self::dispatch($this->filename, $this->projectid, $buildid, md5_file(Storage::path("inbox/{$this->filename}")));
+            } else {
+                self::dispatch($this->filename, $this->projectid, $buildid, md5_file(Storage::path("inbox/{$this->filename}")))->delay(now()->addSeconds($delay));
+            }
+
             return true;
         }
     }

app/cdash/include/autoremove.php

@@ -91,16 +91,16 @@ function removeFirstBuilds($projectid, $days, $maxbuilds, $force = false, $echo
 
     add_log('about to query for builds to remove', 'removeFirstBuilds');
     $db = Database::getInstance();
-    $builds = $db->executePrepared('
+    $builds = $db->executePrepared("
                        SELECT id
                        FROM build
                        WHERE
                            parentid IN (0, -1)
                            AND starttime<?
                            AND projectid=?
                        ORDER BY starttime ASC
-                       LIMIT 10
-                   ', [$startdate, intval($projectid)]);
+                       LIMIT $maxbuilds
+                   ", [$startdate, intval($projectid)]);
     add_last_sql_error('dailyupdates::removeFirstBuilds');
 
     $buildids = [];