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

…22.1-81313 release-22.1: acceptance: update how we build the `python` compose image
cockroachdb · May 17, 2022 · 423c67c · 423c67c
2 parents d451c58 + 473396c
commit 423c67c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/acceptance/compose/gss/python/Dockerfile b/pkg/acceptance/compose/gss/python/Dockerfile
@@ -1,10 +1,12 @@
 FROM python:3
 ENV PYTHONUNBUFFERED 1
 
-RUN apt-get update && \
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+  echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list && \
+  apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
   krb5-user \
-  postgresql-client
+  postgresql-client-11
 
 RUN mkdir /code
 WORKDIR /code

diff --git a/pkg/acceptance/compose_test.go b/pkg/acceptance/compose_test.go
@@ -21,7 +21,6 @@ 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"
@@ -31,7 +30,6 @@ func TestComposeGSS(t *testing.T) {
 }
 
 func TestComposeGSSPython(t *testing.T) {
-	skip.WithIssue(t, 81254)
 	testCompose(t, filepath.Join("gss", "docker-compose-python.yml"), "python")
 }