Skip to content

Commit

Permalink
upgrades: rework job_info upgrade test
Browse files Browse the repository at this point in the history
This test has been rewritten to explicitly indicate
what version the test cluster is being bootstrapped
and upgraded to.

Informs: cockroachdb#100552
Release note: None
  • Loading branch information
adityamaru committed Apr 5, 2023
1 parent 713eb47 commit 7c1df10
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions pkg/upgrade/upgrades/system_job_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
},
},
},
Expand Down

0 comments on commit 7c1df10

Please sign in to comment.