From 7c1df10ebf883ecb2993148975cfd7ba0c38352b Mon Sep 17 00:00:00 2001 From: adityamaru Date: Tue, 4 Apr 2023 22:38:46 -0400 Subject: [PATCH] upgrades: rework job_info upgrade test This test has been rewritten to explicitly indicate what version the test cluster is being bootstrapped and upgraded to. Informs: #100552 Release note: None --- pkg/upgrade/upgrades/system_job_info_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/upgrade/upgrades/system_job_info_test.go b/pkg/upgrade/upgrades/system_job_info_test.go index a69e7e9963cf..9e4f2e2023cc 100644 --- a/pkg/upgrade/upgrades/system_job_info_test.go +++ b/pkg/upgrade/upgrades/system_job_info_test.go @@ -18,7 +18,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/server" - "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils" "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" @@ -32,19 +31,13 @@ func TestSystemJobInfoMigration(t *testing.T) { defer leaktest.AfterTest(t)() ctx := context.Background() - settings := cluster.MakeTestingClusterSettingsWithVersions( - clusterversion.TestingBinaryVersion, - clusterversion.ByKey(clusterversion.V22_2), - false, - ) - tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ ServerArgs: base.TestServerArgs{ - Settings: settings, Knobs: base.TestingKnobs{ Server: &server.TestingKnobs{ DisableAutomaticVersionUpgrade: make(chan struct{}), - BinaryVersionOverride: clusterversion.ByKey(clusterversion.V22_2), + BinaryVersionOverride: clusterversion.ByKey(clusterversion.BinaryMinSupportedVersionKey), + BootstrapVersionKeyOverride: clusterversion.BinaryMinSupportedVersionKey, }, }, },