21361: Update various random Docker tests to Debian 11

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/lib/controller/localdb/login_ldap_docker_test.sh b/lib/controller/localdb/login_ldap_docker_test.sh
index 6fc6dd9444bf0f44d30f220a9381a5a994684b0f..c539e0e60b124c75c3dd14792b4402e84f6c8756 100755 (executable)
--- a/lib/controller/localdb/login_ldap_docker_test.sh
+++ b/lib/controller/localdb/login_ldap_docker_test.sh
@@ -208,7 +208,7 @@ docker run --detach --rm --name=${ctrlctr} \
        -v "${tmpdir}/arvados-server":/bin/arvados-server:ro \
        -v "${tmpdir}/zzzzz.yml":/etc/arvados/config.yml:ro \
        -v $(realpath "${PWD}/../../.."):/arvados:ro \
-       debian:10 \
+       debian:11 \
        bash -c "${setup_pam_ldap:-true} && arvados-server controller"
 docker logs --follow ${ctrlctr} 2>$debug >$debug &
 ctrlhostports=$(docker port ${ctrlctr} 9999/tcp)

diff --git a/lib/install/arvadostest_docker_build.sh b/lib/install/arvadostest_docker_build.sh
index 020fe8b72f7a46822eec42fb5e82257e73c0e58e..3f0245293e5f1a39475613e2afe7c7f0ca6d980a 100755 (executable)
--- a/lib/install/arvadostest_docker_build.sh
+++ b/lib/install/arvadostest_docker_build.sh
@@ -11,7 +11,7 @@ SRC=$(realpath $(dirname ${BASH_SOURCE[0]})/../..)
 ctrname=arvadostest
 ctrbase=${ctrname}
 if [[ "${1}" != "--update" ]] || ! docker images --format={{.Repository}} | grep -x ${ctrbase}; then
-    ctrbase=debian:10
+    ctrbase=debian:11
 fi
 
 if docker ps -a --format={{.Names}} | grep -x ${ctrname}; then

diff --git a/lib/pam/docker_test.go b/lib/pam/docker_test.go
index fa16b313beaed8b66b9f1544d148a30c05b78f83..196cb97174952a41fa3daceeb7e5b3665416200a 100644 (file)
--- a/lib/pam/docker_test.go
+++ b/lib/pam/docker_test.go
@@ -114,7 +114,7 @@ func (s *DockerSuite) runTestClient(c *check.C, args ...string) (stdout, stderr
                "-v", s.tmpdir + "/pam_arvados.so:/usr/lib/pam_arvados.so:ro",
                "-v", s.tmpdir + "/conffile:/usr/share/pam-configs/arvados:ro",
                "-v", s.tmpdir + "/testclient:/testclient:ro",
-               "debian:buster",
+               "debian:bullseye",
                "/testclient"}, args...)...)
        stdout = &bytes.Buffer{}
        stderr = &bytes.Buffer{}