[ARVADOS] updated: 1.1.0-150-g7209d0a
Git user
git at public.curoverse.com
Thu Nov 30 11:27:15 EST 2017
Summary of changes:
build/run-tests.sh | 2 ++
sdk/go/version/version_test.go | 30 ++++++++++++++++++++++++++++++
services/crunch-run/crunchrun.go | 5 +++--
3 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 sdk/go/version/version_test.go
via 7209d0ade292bebbc8d92f8200778b3250e4130a (commit)
from cb9c8f800495b8a499348d931326a06f020b8ffa (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 7209d0ade292bebbc8d92f8200778b3250e4130a
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Thu Nov 30 13:26:19 2017 -0300
10666: Added Crunch-run version to container logs.
Added test for version package.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index ffe0e50..8369632 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -102,6 +102,7 @@ sdk/go/manifest
sdk/go/blockdigest
sdk/go/streamer
sdk/go/stats
+sdk/go/version
sdk/go/crunchrunner
sdk/cwl
tools/arv-sync-groups
@@ -830,6 +831,7 @@ gostuff=(
sdk/go/streamer
sdk/go/crunchrunner
sdk/go/stats
+ sdk/go/version
lib/crunchstat
services/arv-git-httpd
services/crunchstat
diff --git a/sdk/go/version/version_test.go b/sdk/go/version/version_test.go
new file mode 100644
index 0000000..426c124
--- /dev/null
+++ b/sdk/go/version/version_test.go
@@ -0,0 +1,30 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package version
+
+import (
+ "testing"
+
+ . "gopkg.in/check.v1"
+)
+
+// Gocheck boilerplate
+func Test(t *testing.T) {
+ TestingT(t)
+}
+
+type TestSuite struct {
+}
+
+var _ = Suite(&TestSuite{})
+
+func (s *TestSuite) TestVersion(c *C) {
+ // Default version string when Version is not set
+ c.Assert(Version, Equals, "")
+ c.Assert(GetVersion(), Equals, "dev")
+ // Simulate linker flag setting Version var
+ Version = "1.0.0"
+ c.Assert(GetVersion(), Equals, "1.0.0")
+}
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index c983cbd..c45a3f0 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -617,7 +617,7 @@ type infoCommand struct {
cmd []string
}
-// Gather node information and store it on the log for debugging
+// LogNodeInfo gathers node information and store it on the log for debugging
// purposes.
func (runner *ContainerRunner) LogNodeInfo() (err error) {
w := runner.NewLogWriter("node-info")
@@ -667,7 +667,7 @@ func (runner *ContainerRunner) LogNodeInfo() (err error) {
return nil
}
-// Get and save the raw JSON container record from the API server
+// LogContainerRecord gets and saves the raw JSON container record from the API server
func (runner *ContainerRunner) LogContainerRecord() (err error) {
w := &ArvLogWriter{
ArvClient: runner.ArvClient,
@@ -1419,6 +1419,7 @@ func (runner *ContainerRunner) NewArvLogWriter(name string) io.WriteCloser {
// Run the full container lifecycle.
func (runner *ContainerRunner) Run() (err error) {
+ runner.CrunchLog.Printf("crunch-run %q started", arvadosVersion.GetVersion())
runner.CrunchLog.Printf("Executing container '%s'", runner.Container.UUID)
hostname, hosterr := os.Hostname()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list