Merge #152640 #152686

152640: master: Update pkg/testutils/release/cockroach_releases.yaml r=rail a=cockroach-teamcity

Update pkg/testutils/release/cockroach_releases.yaml with recent values.

Epic: None
Release note: None
Release justification: test-only updates

152686: workflows: improve logging and search criteria for auto-merge workflow r=rafiss a=rafiss

### workflows: log when auto-merge workflow has nothing to do

### workflows: broaden criteria for auto-merge workflow

Previously, the search excluded PRs made by the blathers bot account as
well as PRs that didn't have the blathers-backport label.

In practice, this meant it only found PRs that were made by blathers
_and also_ only if the original PR author had set up oauth to allow
blathers to automatically backport it using their account.

Now, the search will find any test only backport PR, regardless of
author.

Epic: None
Release note: None

Co-authored-by: CRL Release bot <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>

Author: 3 people

.github/workflows/auto-merge-backports.yml

@@ -24,7 +24,7 @@ jobs:
 
             const query = `
               query SearchPRs() {
-                search(query: "repo:${context.repo.owner}/${context.repo.repo} is:pr is:open label:backport label:blathers-backport label:backport-test-only -author:blathers-crl[bot]", type: ISSUE, first: 100) {
+                search(query: "repo:${context.repo.owner}/${context.repo.repo} is:pr is:open label:backport label:backport-test-only", type: ISSUE, first: 100) {
                   nodes {
                     ... on PullRequest {
                       number
@@ -51,6 +51,12 @@ jobs:
             const result = await github.graphql(query);
             const prs = result.search.nodes;
 
+            if (prs.length === 0) {
+              console.log('No backport PRs found matching criteria');
+            } else {
+              console.log(`Found ${prs.length} backport PR(s) to evaluate`);
+            }
+
             for (const pr of prs) {
               const createdAt = new Date(pr.createdAt);
               const isOldEnough = createdAt <= iso24HoursAgo;

pkg/sql/logictest/REPOSITORIES.bzl

@@ -7,11 +7,11 @@ CONFIG_DARWIN_AMD64 = "darwin-10.9-amd64"
 CONFIG_DARWIN_ARM64 = "darwin-11.0-arm64"
 
 _CONFIGS = [
-    ("25.2.4", [
-        (CONFIG_DARWIN_AMD64, "23e2f7e68a38fcc8186f00e021e3e851823a32dad2d31663f594c2b904c71a58"),
-        (CONFIG_DARWIN_ARM64, "86c28ca0400660205db20ebcc81d3ea296f7efae5e6bb13c2bf31bc04651fad6"),
-        (CONFIG_LINUX_AMD64, "7b433d00bb57d9947dc9931058b16f44ff31dd2a25ed625233c3bf62e4413b58"),
-        (CONFIG_LINUX_ARM64, "f808519d147cb0f7772569d981c7f6aa47b82cb06c35e4eb1eb2aaad87024813"),
+    ("25.2.5", [
+        (CONFIG_DARWIN_AMD64, "d4e916ddc73970cd3a805a6bdc0b2539c64ef26402b61869c871e9363c5dab67"),
+        (CONFIG_DARWIN_ARM64, "85c98fe4e9eebafda279e384cca939190c3031f556d81ff3a7067a57b97b4bb8"),
+        (CONFIG_LINUX_AMD64, "3fb4d204a4b286583a2f6b1a4711c5322d039bf751b17dfa7d5920ba2f94cef2"),
+        (CONFIG_LINUX_ARM64, "7fe100b576fcd6347b6cc0d192d6e88f8b08dc3feb243fd6b4ade422f74b0b84"),
     ]),
     ("25.3.0", [
         (CONFIG_DARWIN_AMD64, "8628ceee258fc662a25108e5df0359b183cfe0118bdab993cd5cc1ce21abe63a"),

pkg/testutils/release/cockroach_releases.yaml

@@ -22,21 +22,21 @@
   latest: 23.2.27
   predecessor: "23.1"
 "24.1":
-  latest: 24.1.22
+  latest: 24.1.23
   predecessor: "23.2"
 "24.2":
   latest: 24.2.10
   withdrawn:
   - 24.2.1
   predecessor: "24.1"
 "24.3":
-  latest: 24.3.18
+  latest: 24.3.19
   predecessor: "24.2"
 "25.1":
   latest: 25.1.10
   predecessor: "24.3"
 "25.2":
-  latest: 25.2.4
+  latest: 25.2.5
   predecessor: "25.1"
 "25.3":
   latest: 25.3.0