[arvados] updated: 2.6.0-519-gb239cf066
git repository hosting
git at public.arvados.org
Wed Aug 16 13:33:30 UTC 2023
Summary of changes:
lib/boot/cmd.go | 6 ++++--
lib/boot/supervisor.go | 4 ++--
lib/install/deps.go | 13 ++++++++-----
lib/install/deps_test.go | 17 +++++------------
4 files changed, 19 insertions(+), 21 deletions(-)
via b239cf066ed702d66e908af2861716618479e7ab (commit)
via 1a2caf782dfd63a963094cd4b2bce5f5e7bfb7ef (commit)
via 997887766267651908396c7906c7a0cd6e38f796 (commit)
via 9b55faf8457a9d2b472dd0e61c1d4d368889a515 (commit)
via 0fc8c660f43ef247a74ba624fb11f9529af608cf (commit)
via e7a24aee9c68263e334547875bf0f9af0389b86d (commit)
via dc8e49790645656c3ff58c9fbe59f907ca552a17 (commit)
via bb1a08fca31fde636f732f8d93d250e0c01d1682 (commit)
from baef845de7afea10a7884e7daa2798113ec8d477 (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 b239cf066ed702d66e908af2861716618479e7ab
Merge: baef845de 1a2caf782
Author: Tom Clegg <tom at curii.com>
Date: Wed Aug 16 09:32:32 2023 -0400
Merge branch '20735-install-test'
refs #20735
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
commit 1a2caf782dfd63a963094cd4b2bce5f5e7bfb7ef
Author: Tom Clegg <tom at curii.com>
Date: Wed Aug 16 09:04:18 2023 -0400
20735: Workaround nginx/glibc/docker issue.
Docker writes both "::1 localhost" and "127.0.0.1 localhost" in
/etc/hosts even when not enabling IPv6 [1], causing glibc to resolve
"localhost" to two identical IP addresses 127.0.0.1 and 127.0.0.1 [2],
causing nginx to error out on "listen localhost:45123;" [3]:
[emerg] a duplicate listen 127.0.0.1:45123 in /tmp/nginx.conf:29
[1] https://github.com/moby/moby/issues/35954#issuecomment-498406618
("you should be testing with IPv6 enabled")
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=14969 (open since
2012-12-17)
[2] https://trac.nginx.org/nginx/ticket/2400 (workaround added
2022-11-23)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index 6740993da..dc5c43180 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -67,7 +67,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
flags.StringVar(&super.ConfigPath, "config", "/etc/arvados/config.yml", "arvados config file `path`")
flags.StringVar(&super.SourcePath, "source", ".", "arvados source tree `directory`")
flags.StringVar(&super.ClusterType, "type", "production", "cluster `type`: development, test, or production")
- flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for internal services whose InternalURLs are not configured")
+ flags.StringVar(&super.ListenHost, "listen-host", "127.0.0.1", "host name or interface address for internal services whose InternalURLs are not configured")
flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
// Default for -workbench2-source is where `arvados-server
// install` puts its checkout.
commit 997887766267651908396c7906c7a0cd6e38f796
Author: Tom Clegg <tom at curii.com>
Date: Fri Aug 11 09:47:10 2023 -0400
20735: Fix default workbench2-source path.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index 4b7284556..6740993da 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -69,7 +69,9 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
flags.StringVar(&super.ClusterType, "type", "production", "cluster `type`: development, test, or production")
flags.StringVar(&super.ListenHost, "listen-host", "localhost", "host name or interface address for internal services whose InternalURLs are not configured")
flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
- flags.StringVar(&super.Workbench2Source, "workbench2-source", "../arvados-workbench2", "path to arvados-workbench2 source tree")
+ // Default for -workbench2-source is where `arvados-server
+ // install` puts its checkout.
+ flags.StringVar(&super.Workbench2Source, "workbench2-source", "/var/lib/arvados/arvados-workbench2", "path to arvados-workbench2 source tree")
flags.BoolVar(&super.NoWorkbench1, "no-workbench1", false, "do not run workbench1")
flags.BoolVar(&super.NoWorkbench2, "no-workbench2", false, "do not run workbench2")
flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database")
commit 9b55faf8457a9d2b472dd0e61c1d4d368889a515
Author: Tom Clegg <tom at curii.com>
Date: Thu Aug 10 17:18:27 2023 -0400
20735: Override git directory ownership check.
Without this, `git diff --shortstat` returns an error "warning: Not a
git repository."
The real problem, as reported by `git status`, is "fatal: detected
dubious ownership in repository at '/path'".
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/deps_test.go b/lib/install/deps_test.go
index 5b3f9d350..08187ce9d 100644
--- a/lib/install/deps_test.go
+++ b/lib/install/deps_test.go
@@ -33,7 +33,9 @@ docker run -i --rm --workdir /arvados \
--env http_proxy \
--env https_proxy \
debian:11 \
- bash -c "/arvados-server install -type test && /arvados-server boot -type test -config doc/examples/config/zzzzz.yml -own-temporary-database -shutdown -timeout 9m"
+ bash -c "/arvados-server install -type test &&
+ git config --global --add safe.directory /arvados &&
+ /arvados-server boot -type test -config doc/examples/config/zzzzz.yml -own-temporary-database -shutdown -timeout 9m"
`
c.Check((&installCommand{}).runBash(script, os.Stdout, os.Stderr), check.IsNil)
}
commit 0fc8c660f43ef247a74ba624fb11f9529af608cf
Author: Tom Clegg <tom at curii.com>
Date: Thu Aug 10 16:41:49 2023 -0400
20735: Fix auto version generator.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 0f0600f18..55fe9d2e3 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -325,13 +325,13 @@ func (super *Supervisor) runCluster() error {
} else if super.SourceVersion == "" {
// Find current source tree version.
var buf bytes.Buffer
- err = super.RunProgram(super.ctx, ".", runOptions{output: &buf}, "git", "diff", "--shortstat")
+ err = super.RunProgram(super.ctx, super.SourcePath, runOptions{output: &buf}, "git", "diff", "--shortstat")
if err != nil {
return err
}
dirty := buf.Len() > 0
buf.Reset()
- err = super.RunProgram(super.ctx, ".", runOptions{output: &buf}, "git", "log", "-n1", "--format=%H")
+ err = super.RunProgram(super.ctx, super.SourcePath, runOptions{output: &buf}, "git", "log", "-n1", "--format=%H")
if err != nil {
return err
}
commit e7a24aee9c68263e334547875bf0f9af0389b86d
Author: Tom Clegg <tom at curii.com>
Date: Thu Aug 10 15:22:55 2023 -0400
20735: Revive lib/install dependency test.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/deps_test.go b/lib/install/deps_test.go
index 993e779e5..5b3f9d350 100644
--- a/lib/install/deps_test.go
+++ b/lib/install/deps_test.go
@@ -13,19 +13,10 @@ package install
import (
"os"
- "testing"
"gopkg.in/check.v1"
)
-func Test(t *testing.T) {
- check.TestingT(t)
-}
-
-var _ = check.Suite(&Suite{})
-
-type Suite struct{}
-
func (*Suite) TestInstallDeps(c *check.C) {
tmp := c.MkDir()
script := `
@@ -41,8 +32,8 @@ docker run -i --rm --workdir /arvados \
-v /arvados/services/api/tmp \
--env http_proxy \
--env https_proxy \
- debian:10 \
+ debian:11 \
bash -c "/arvados-server install -type test && /arvados-server boot -type test -config doc/examples/config/zzzzz.yml -own-temporary-database -shutdown -timeout 9m"
`
- c.Check(runBash(script, os.Stdout, os.Stderr), check.IsNil)
+ c.Check((&installCommand{}).runBash(script, os.Stdout, os.Stderr), check.IsNil)
}
commit dc8e49790645656c3ff58c9fbe59f907ca552a17
Author: Tom Clegg <tom at curii.com>
Date: Thu Aug 10 15:21:52 2023 -0400
20735: Fix firefox package name on debian 11.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/deps.go b/lib/install/deps.go
index 5b5b0a076..cbf050d7d 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -193,6 +193,8 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
if test {
if osv.Debian && osv.Major <= 10 {
pkgs = append(pkgs, "iceweasel")
+ } else if osv.Debian && osv.Major >= 11 {
+ pkgs = append(pkgs, "firefox-esr")
} else {
pkgs = append(pkgs, "firefox")
}
commit bb1a08fca31fde636f732f8d93d250e0c01d1682
Author: Tom Clegg <tom at curii.com>
Date: Thu Aug 10 15:20:15 2023 -0400
20735: Fixup singularity dependencies (test/dev-only).
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/deps.go b/lib/install/deps.go
index dc8ec39f6..5b5b0a076 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -156,14 +156,12 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
"gettext",
"libattr1-dev",
"libfuse-dev",
- "libgbm1", // cypress / workbench2 tests
- "libglib2.0-dev", // common, used by singularity
+ "libgbm1", // cypress / workbench2 tests
"libgnutls28-dev",
"libpam-dev",
"libpcre3-dev",
"libpq-dev",
"libreadline-dev",
- "libseccomp-dev", // singularity
"libssl-dev",
"libxml2-dev",
"libxslt1-dev",
@@ -200,8 +198,11 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
}
}
if dev || test {
- pkgs = append(pkgs, "squashfs-tools") // for singularity
- pkgs = append(pkgs, "gnupg") // for docker install recipe
+ pkgs = append(pkgs,
+ "libglib2.0-dev", // singularity (conmon)
+ "libseccomp-dev", // singularity (seccomp)
+ "squashfs-tools", // singularity
+ "gnupg") // docker install recipe
}
switch {
case osv.Debian && osv.Major >= 11:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list