[ARVADOS] updated: 1.3.0-1126-ge61d0c92e

Git user git at public.curoverse.com
Tue Jun 25 21:22:29 UTC 2019


Summary of changes:
 lib/cloud/cloudtest/tester.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

       via  e61d0c92e9f52c8db5e65026a551f62918aad1b4 (commit)
       via  689bd83873cf8e3c061476ff769ee7c789c5aa26 (commit)
      from  0684f84ec50069b24b4564474db67d6b44266699 (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 e61d0c92e9f52c8db5e65026a551f62918aad1b4
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 25 16:24:28 2019 -0400

    15026: Treat bad-tags and boot-timeout as deferred errors.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/cloud/cloudtest/tester.go b/lib/cloud/cloudtest/tester.go
index cafd34c3e..dc5a4738a 100644
--- a/lib/cloud/cloudtest/tester.go
+++ b/lib/cloud/cloudtest/tester.go
@@ -169,11 +169,11 @@ func (t *tester) Run() bool {
 
 	if !t.checkTags() {
 		// checkTags() already logged the errors
-		return false
+		deferredError = true
 	}
 
 	if !t.waitForBoot(bootDeadline) {
-		return false
+		deferredError = true
 	}
 
 	if t.ShellCommand != "" {

commit 689bd83873cf8e3c061476ff769ee7c789c5aa26
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 25 16:23:08 2019 -0400

    15026: Remove redundant TagVerifier use.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/cloud/cloudtest/tester.go b/lib/cloud/cloudtest/tester.go
index 33ff264bc..cafd34c3e 100644
--- a/lib/cloud/cloudtest/tester.go
+++ b/lib/cloud/cloudtest/tester.go
@@ -46,7 +46,7 @@ type tester struct {
 	PauseBeforeDestroy func()
 
 	is              cloud.InstanceSet
-	testInstance    cloud.Instance
+	testInstance    *worker.TagVerifier
 	secret          string
 	executor        *ssh_executor.Executor
 	showedLoginInfo bool
@@ -155,7 +155,7 @@ func (t *tester) Run() bool {
 		// Create() succeeded. Make sure the new instance
 		// appears right away in the Instances() list.
 		t.Logger.WithField("Instance", inst.ID()).Info("created instance")
-		t.testInstance = inst
+		t.testInstance = &worker.TagVerifier{inst, t.secret}
 		t.showLoginInfo()
 		err = t.refreshTestInstance()
 		if err == errTestInstanceNotFound {
@@ -166,7 +166,6 @@ func (t *tester) Run() bool {
 			return false
 		}
 	}
-	t.testInstance = worker.TagVerifier{t.testInstance, t.secret}
 
 	if !t.checkTags() {
 		// checkTags() already logged the errors
@@ -232,7 +231,7 @@ func (t *tester) refreshTestInstance() error {
 			"Instance": i.ID(),
 			"Address":  i.Address(),
 		}).Info("found our instance in returned list")
-		t.testInstance = worker.TagVerifier{i, t.secret}
+		t.testInstance = &worker.TagVerifier{i, t.secret}
 		if !t.showedLoginInfo {
 			t.showLoginInfo()
 		}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list