From f676ab7f7d8d3c3862ad1121961990f51c493440 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Mon, 29 Jan 2024 12:02:48 -0500 Subject: [PATCH] 21361: Update various random Docker tests to Debian 11 Arvados-DCO-1.1-Signed-off-by: Brett Smith --- lib/controller/localdb/login_ldap_docker_test.sh | 2 +- lib/install/arvadostest_docker_build.sh | 2 +- lib/pam/docker_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/controller/localdb/login_ldap_docker_test.sh b/lib/controller/localdb/login_ldap_docker_test.sh index 6fc6dd9444..c539e0e60b 100755 --- 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 020fe8b72f..3f0245293e 100755 --- 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 fa16b313be..196cb97174 100644 --- 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{} -- 2.30.2