[ARVADOS] updated: 2.1.0-336-g3b212b312
Git user
git at public.arvados.org
Wed Jan 27 08:13:47 UTC 2021
Summary of changes:
cmd/arvados-package/build.go | 2 +-
cmd/arvados-package/install.go | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
via 3b212b31231e7ed0ae576163655396a1aeac3f62 (commit)
from 01e15db1f4a331508117bc841256acec8ca361de (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 3b212b31231e7ed0ae576163655396a1aeac3f62
Author: Tom Clegg <tom at curii.com>
Date: Wed Jan 27 03:09:33 2021 -0500
16306: Accept -package-version arg to testinstall.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index cf9cbfa6c..e826408c1 100644
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -126,7 +126,7 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
return err
}
- cmd = exec.CommandContext(ctx, "bash", "-c", "dpkg-scanpackages . | gzip > Packages.gz.tmp && mv Packages.gz.tmp Packages.gz")
+ cmd = exec.CommandContext(ctx, "bash", "-c", "dpkg-scanpackages --multiversion . | gzip > Packages.gz.tmp && mv Packages.gz.tmp Packages.gz")
cmd.Stdout = stdout
cmd.Stderr = stderr
cmd.Dir = opts.PackageDir
diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 774771efb..984779950 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -6,7 +6,6 @@ package main
import (
"context"
- "errors"
"fmt"
"io"
"io/ioutil"
@@ -20,9 +19,6 @@ import (
)
func testinstall(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writer) error {
- if opts.PackageVersion != "" {
- return errors.New("not implemented: package version was specified, but I only know how to test the latest version in pkgdir")
- }
depsImageName := "arvados-package-deps-" + opts.TargetOS
depsCtrName := strings.Replace(depsImageName, ":", "-", -1)
@@ -77,6 +73,10 @@ eatmydata apt-get remove -y arvados-server-easy
}
}
+ versionsuffix := ""
+ if opts.PackageVersion != "" {
+ versionsuffix = "=" + opts.PackageVersion
+ }
cmd := exec.CommandContext(ctx, "docker", "run", "--rm",
"--tmpfs", "/tmp:exec,mode=01777",
"-v", opts.PackageDir+":/pkg:ro",
@@ -87,7 +87,7 @@ eatmydata apt-get remove -y arvados-server-easy
set -e
PATH="/var/lib/arvados/bin:$PATH"
apt-get update
-eatmydata apt-get install --reinstall -y --no-install-recommends arvados-server-easy
+eatmydata apt-get install --reinstall -y --no-install-recommends arvados-server-easy`+versionsuffix+`
apt-get -y autoremove
/etc/init.d/postgresql start
arvados-server init -cluster-id x1234
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list