[arvados] updated: 2.7.0-5947-gfd341d5c32
git repository hosting
git at public.arvados.org
Mon Jan 29 17:08:04 UTC 2024
Summary of changes:
lib/controller/localdb/login_ldap_docker_test.sh | 2 +-
lib/install/arvadostest_docker_build.sh | 6 +++++-
lib/install/deps.go | 2 --
lib/install/example_from_scratch.sh | 14 ++++++++------
lib/pam/docker_test.go | 2 +-
5 files changed, 15 insertions(+), 11 deletions(-)
via fd341d5c32883c778fe9543174a87cbea2730d9b (commit)
via a40baeb266328c714414b9875c9c68339473d828 (commit)
via 034764149ebf99c92c32d2223e2c59c8623733d1 (commit)
via 4103371c18ba98ff8b4694f7e684a45b3ca9c812 (commit)
from 2eebf1fa4aab44cf47e5b44f17ecce2e8c2c208c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit fd341d5c32883c778fe9543174a87cbea2730d9b
Author: Brett Smith <brett.smith at curii.com>
Date: Mon Jan 29 12:02:48 2024 -0500
21361: Update various random Docker tests to Debian 11
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
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{}
commit a40baeb266328c714414b9875c9c68339473d828
Author: Brett Smith <brett.smith at curii.com>
Date: Mon Jan 29 11:58:08 2024 -0500
21361: Remove Debian 10 support from installer
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/lib/install/deps.go b/lib/install/deps.go
index 9f483b7654..e05151688a 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -273,8 +273,6 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
} else if osv.Debian {
var codename string
switch osv.Major {
- case 10:
- codename = "buster"
case 11:
codename = "bullseye"
case 12:
commit 034764149ebf99c92c32d2223e2c59c8623733d1
Author: Brett Smith <brett.smith at curii.com>
Date: Mon Jan 29 11:57:22 2024 -0500
21361: Modernize test script
* Update for Debian 11.
* Assume #16053 has been merged, as it has been for a while.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/lib/install/example_from_scratch.sh b/lib/install/example_from_scratch.sh
index ce10834fe6..182e1bfeb5 100644
--- a/lib/install/example_from_scratch.sh
+++ b/lib/install/example_from_scratch.sh
@@ -6,16 +6,14 @@
set -e -o pipefail
-# Starting with a base debian buster system, like "docker run -it
-# debian:10"...
+# Starting with a base debian bullseye system, like "docker run -it
+# debian:11"...
apt update
apt upgrade
apt install --no-install-recommends build-essential ca-certificates git golang
git clone https://git.arvados.org/arvados.git
-cd arvados
-[[ -e lib/install ]] || git checkout origin/16053-install-deps
-cd cmd/arvados-server
+cd arvados/cmd/arvados-server
go run ./cmd/arvados-server install -type test
-pg_isready || pg_ctlcluster 11 main start # only needed if there's no init process (as in docker)
+pg_isready || pg_ctlcluster 13 main start # only needed if there's no init process (as in docker)
build/run-tests.sh
commit 4103371c18ba98ff8b4694f7e684a45b3ca9c812
Author: Brett Smith <brett.smith at curii.com>
Date: Mon Jan 29 12:02:21 2024 -0500
21361: Add license headers
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/lib/install/arvadostest_docker_build.sh b/lib/install/arvadostest_docker_build.sh
index e0defa888a..020fe8b72f 100755
--- a/lib/install/arvadostest_docker_build.sh
+++ b/lib/install/arvadostest_docker_build.sh
@@ -1,4 +1,8 @@
#!/bin/bash
+#
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
set -ex -o pipefail
diff --git a/lib/install/example_from_scratch.sh b/lib/install/example_from_scratch.sh
index 03d9b7f63b..ce10834fe6 100644
--- a/lib/install/example_from_scratch.sh
+++ b/lib/install/example_from_scratch.sh
@@ -1,4 +1,8 @@
#!/bin/bash
+#
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
set -e -o pipefail
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list