Merge pull request #92849 from cockroachdb/blathers/backport-release-…

…22.1-92837 release-22.1: acceptance: fix TestComposeGSS
cockroachdb · Dec 1, 2022 · 2abd109 · 2abd109
2 parents 2f073a5 + 09eeeff
commit 2abd109
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pkg/acceptance/compose/gss/psql/Dockerfile b/pkg/acceptance/compose/gss/psql/Dockerfile
@@ -5,7 +5,7 @@ COPY . .
 RUN go test -v -c -tags gss_compose -o gss.test
 
 # Copy the test binary to an image with psql and krb installed.
-FROM postgres:11
+FROM postgres:15
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \

diff --git a/pkg/acceptance/compose_test.go b/pkg/acceptance/compose_test.go
@@ -22,13 +22,11 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/acceptance/cluster"
 	"github.com/cockroachdb/cockroach/pkg/build/bazel"
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 )
 
 const composeDir = "compose"
 
 func TestComposeGSS(t *testing.T) {
-	skip.WithIssue(t, 91420)
 	testCompose(t, filepath.Join("gss", "docker-compose.yml"), "psql")
 }