[ARVADOS] updated: 1.1.0-51-gcc16a2d

[Git user]

Summary of changes:
 build/run-build-packages-one-target.sh | 2 +-
 sdk/cwl/gittaggers.py                  | 3 +++
 sdk/cwl/setup.py                       | 4 ++++
 sdk/python/gittaggers.py               | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

       via  cc16a2d4a9d5e7c823a7d127d0a437d35bf12bd5 (commit)
      from  476f1e7207c0e45aadbcb44b946d8ca14808288a (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 cc16a2d4a9d5e7c823a7d127d0a437d35bf12bd5
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Thu Oct 12 15:31:32 2017 -0300

    12389: update fix for buildnumber in gittaggers.py
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 0c9c45b..7f75624 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: AGPL-3.0
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 764d0f1..6a248fa 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -6,6 +6,7 @@ from setuptools.command.egg_info import egg_info
 import subprocess
 import time
 import os
+import requests
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 
@@ -36,8 +37,10 @@ class EggInfoFromGit(egg_info):
         return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo)))
     """
     def git_latest_tag(self):
+        buildnumber = requests.get ('https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
         gitinfo = subprocess.check_output(
             ['git', 'describe', '--abbrev=0'])
+        gitinfo = gitinfo + '-' + str(buildnumber.json())
         return str(gitinfo)
 
     def tags(self):
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index ab3442b..700673e 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -21,8 +21,12 @@ except ImportError:
 
 versionfile = os.path.join(SETUP_DIR, "arvados_cwl/_version.py")
 try:
+    buildnumber = requests.get ('https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
     gitinfo = subprocess.check_output(
             ['git', 'describe', '--abbrev=0'])
+    gitinfo = gitinfo + '-' + str(buildnumber.json())
+    return str(gitinfo)
+    
     with open(versionfile, "w") as f:
         f.write("__version__ = '%s'\n" % gitinfo)
 except Exception as e:
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index 8acbe27..ae3c167 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -25,8 +25,10 @@ class EggInfoFromGit(egg_info):
     """
 
     def git_latest_tag(self):
+        buildnumber = requests.get ('https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
         gitinfo = subprocess.check_output(
             ['git', 'describe', '--abbrev=0'])
+        gitinfo = gitinfo + '-' + str(buildnumber.json())
         return str(gitinfo)
 
     def tags(self):

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


hooks/post-receive
--