Bump CockroachDB to 22.2.17

google · Jan 18, 2024 · 53f08f4 · 53f08f4
1 parent 63a7f6c
commit 53f08f4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml → .github/workflows/test_crdb.yaml b/.github/workflows/test.yaml → .github/workflows/test_crdb.yaml
diff --git a/integration/cloudbuild/testbase/Dockerfile b/integration/cloudbuild/testbase/Dockerfile
@@ -23,9 +23,8 @@ RUN apt-get update && apt-get install -y \
 # Install golangci-lint. See docs at: https://golangci-lint.run/usage/install/.
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.1
 
-# Install CockroachDB, see https://www.cockroachlabs.com/docs/v22.1/install-cockroachdb-linux
-RUN curl https://binaries.cockroachdb.com/cockroach-v22.1.11.linux-amd64.tgz | tar -xz && cp -i cockroach-v22.1.11.linux-amd64/cockroach /usr/local/bin/
-
+# Install CockroachDB, see https://www.cockroachlabs.com/docs/v22.2/install-cockroachdb-linux
+RUN curl https://binaries.cockroachdb.com/cockroach-v22.2.17.linux-amd64.tgz | tar -xz && cp -i cockroach-v22.2.17.linux-amd64/cockroach /usr/local/bin/
 
 RUN mkdir protoc && \
     (cd protoc && \

diff --git a/quota/crdbqm/common_test.go b/quota/crdbqm/common_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	ts, err := testserver.NewTestServer()
+	ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("22.2.17"))
 	if err != nil {
 		klog.Errorf("Failed to start test server: %v", err)
 		os.Exit(1)

diff --git a/storage/crdb/common_test.go b/storage/crdb/common_test.go
@@ -43,7 +43,7 @@ func (db *testDBHandle) GetDB() *sql.DB {
 func TestMain(m *testing.M) {
 	flag.Parse()
 
-	ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("22.2.7"))
+	ts, err := testserver.NewTestServer(testserver.CustomVersionOpt("22.2.17"))
 	if err != nil {
 		klog.Exitf("Failed to start test server: %v", err)
 	}