[ARVADOS-ORG] updated: cd47565c54ae78daeba11986673d182528aa6546

[Git user]

Summary of changes:
 arvados-version-server/arvados-version-server.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  cd47565c54ae78daeba11986673d182528aa6546 (commit)
      from  86b60bea1b3eaf039a31ad8f2f2f25484b76ca68 (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 cd47565c54ae78daeba11986673d182528aa6546
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Jan 26 14:48:58 2018 -0500

    The version number calculation for the arvados/jobs image has changed.
    
    closes #13008
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/arvados-version-server/arvados-version-server.go b/arvados-version-server/arvados-version-server.go
index 7f91f4a..643c4c8 100644
--- a/arvados-version-server/arvados-version-server.go
+++ b/arvados-version-server/arvados-version-server.go
@@ -106,7 +106,7 @@ func loadPackages() (packages []bundle) {
 			name:          "arvados/jobs",
 			packageType:   "docker",
 			versionType:   "docker",
-			versionPrefix: "",
+			versionPrefix: "1.0",
 		},
 		{
 			sourceDir:     "sdk/go/crunchrunner",
@@ -651,10 +651,14 @@ func getPackageVersions(hash string) (versions map[string]map[string]string, git
 					return nil, "", err
 				}
 			}
-			packageVersion, err = dockerVersionFromGit()
+			packageVersion, err = pythonVersionFromGit(p.versionPrefix)
 			if err != nil {
 				return nil, "", err
 			}
+			// Before this date, the arvados/jobs version hash was calculated differently
+			if strings.Compare(packageVersion,"1.0.20171211211613") == -1 {
+				packageVersion, err = dockerVersionFromGit()
+			}
 		}
 
 		if versions[strings.Title(p.packageType)] == nil {

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


hooks/post-receive
--