3894: Use readable timestamp (yyyymmddhhmmss) for python package

version, and use first-parent to ensure each merge to master results
in a higher version number.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 5830565c4cc6ffe60f4172169a0098f3710b6552..612f208ad8ea6275512cf49587af9a6349f0e3f7 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -273,7 +273,7 @@ install_python_sdk() {
     # keepproxy).
 
     cd "$WORKSPACE/sdk/python" \
-        && python setup.py egg_info -b ".$(git log --format=format:%ct.%h -n1 .)" sdist rotate --keep=1 --match .tar.gz \
+        && python setup.py egg_info -b ".$(git log --first-parent --format=format:%ct.%h -n1 . | cut -c 1-4,6-7,9-10,12-13,15-16,18-19,26-33)" sdist rotate --keep=1 --match .tar.gz \
         && pip install dist/arvados-python-client-0.1.*.tar.gz
 }
 do_install python_sdk