clusterversion: bump version to 24.1

docs/generated/settings/settings-for-tenants.txt

@@ -320,4 +320,4 @@ trace.snapshot.rate	duration	0s	if non-zero, interval at which background trace
 trace.span_registry.enabled	boolean	true	if set, ongoing traces can be seen at https://<ui>/#/debug/tracez	application
 trace.zipkin.collector	string		the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.	application
 ui.display_timezone	enumeration	etc/utc	the timezone used to format timestamps in the ui [etc/utc = 0, america/new_york = 1]	application
-version	version	1000023.1-38	set the active cluster version in the format '<major>.<minor>'	application
+version	version	1000023.2-2	set the active cluster version in the format '<major>.<minor>'	application

docs/generated/settings/settings.html

@@ -272,6 +272,6 @@
 <tr><td><div id="setting-trace-span-registry-enabled" class="anchored"><code>trace.span_registry.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if set, ongoing traces can be seen at https://&lt;ui&gt;/#/debug/tracez</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-trace-zipkin-collector" class="anchored"><code>trace.zipkin.collector</code></div></td><td>string</td><td><code></code></td><td>the address of a Zipkin instance to receive traces, as &lt;host&gt;:&lt;port&gt;. If no port is specified, 9411 will be used.</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui [etc/utc = 0, america/new_york = 1]</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
-<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000023.1-38</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
+<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000023.2-2</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 </tbody>
 </table>

pkg/BUILD.bazel

@@ -52,6 +52,7 @@ ALL_TESTS = [
     "//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
     "//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/ccl/logictestccl/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
     "//pkg/ccl/logictestccl/tests/local:local_test",
     "//pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs:multiregion-15node-5region-3azs_test",
@@ -453,6 +454,7 @@ ALL_TESTS = [
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/sql/logictest/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -470,6 +472,7 @@ ALL_TESTS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder_test",
@@ -570,6 +573,7 @@ ALL_TESTS = [
     "//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
     "//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/sql/sqlitelogictest/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/sqlitelogictest/tests/local:local_test",
     "//pkg/sql/sqlliveness/slinstance:slinstance_test",
@@ -857,6 +861,7 @@ GO_TARGETS = [
     "//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
     "//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/ccl/logictestccl/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
     "//pkg/ccl/logictestccl/tests/local:local_test",
     "//pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs:multiregion-15node-5region-3azs_test",
@@ -1849,6 +1854,7 @@ GO_TARGETS = [
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/sql/logictest/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -1875,6 +1881,7 @@ GO_TARGETS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder",
@@ -2114,6 +2121,7 @@ GO_TARGETS = [
     "//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
     "//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-23.1:local-mixed-23_1_test",
+    "//pkg/sql/sqlitelogictest/tests/local-mixed-23.2:local-mixed-23_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/sqlitelogictest/tests/local:local_test",
     "//pkg/sql/sqlitelogictest:sqlitelogictest",

pkg/build/version.txt

@@ -1 +1 @@
-v23.2.0-alpha.4
+v24.1.0-alpha.00000000

pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go

@@ -405,7 +405,6 @@ func v0v1v2() (roachpb.Version, roachpb.Version, roachpb.Version) {
 func TestTenantUpgradeFailure(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	skip.WithIssue(t, 112209)
 
 	v0 := clusterversion.TestingBinaryMinSupportedVersion
 	v2 := clusterversion.TestingBinaryVersion
@@ -418,7 +417,10 @@ func TestTenantUpgradeFailure(t *testing.T) {
 			break
 		}
 	}
-	require.NotEqual(t, v1, roachpb.Version{})
+	if v1 == (roachpb.Version{}) {
+		// There is no in-between version supported; skip this test.
+		skip.IgnoreLint(t, "test can only run when we support two previous releases")
+	}
 
 	t.Log("starting server")
 	ctx := context.Background()

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -400,7 +400,7 @@ select crdb_internal.get_vmodule()
 query T
 select regexp_replace(regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', ''), '10000', '');
 ----
-23.1
+23.2
 
 query ITTT colnames,rowsort
 select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -490,7 +490,7 @@ select * from crdb_internal.gossip_alerts
 query T
 select regexp_replace(regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', ''), '10000', '');
 ----
-23.1
+23.2
 
 user root
 

pkg/ccl/logictestccl/tests/local-mixed-23.2/BUILD.bazel

@@ -0,0 +1,35 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "local-mixed-23_2_test",
+    size = "enormous",
+    srcs = ["generated_test.go"],
+    args = select({
+        "//build/toolchains:use_ci_timeouts": ["-test.timeout=895s"],
+        "//conditions:default": ["-test.timeout=3595s"],
+    }),
+    data = [
+        "//c-deps:libgeos",  # keep
+        "//pkg/ccl/logictestccl:testdata",  # keep
+    ],
+    exec_properties = {"Pool": "large"},
+    shard_count = 6,
+    tags = [
+        "ccl_test",
+        "cpu:1",
+    ],
+    deps = [
+        "//pkg/base",
+        "//pkg/build/bazel",
+        "//pkg/ccl",
+        "//pkg/security/securityassets",
+        "//pkg/security/securitytest",
+        "//pkg/server",
+        "//pkg/sql/logictest",
+        "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
+        "//pkg/testutils/testcluster",
+        "//pkg/util/leaktest",
+        "//pkg/util/randutil",
+    ],
+)