[ARVADOS] updated: 1.1.3-247-g82c4ae9
Git user
git at public.curoverse.com
Wed Mar 21 16:37:03 EDT 2018
Summary of changes:
apps/workbench/Gemfile | 19 +-
apps/workbench/Gemfile.lock | 270 +++++++++++----------
apps/workbench/app/models/container_work_unit.rb | 2 +-
apps/workbench/config/application.default.yml | 2 +-
apps/workbench/config/initializers/mime_types.rb | 1 +
.../test/controllers/disabled_api_test.rb | 3 +
.../controllers/healthcheck_controller_test.rb | 3 +
apps/workbench/test/test_helper.rb | 6 +-
build/build.list | 5 +-
.../package-testing/test-package-python-cwltest.sh | 1 +
.../test-package-python27-python-cwltest.sh | 4 +-
build/package-testing/test-packages-debian9.sh | 41 +---
build/run-tests.sh | 10 +-
doc/_config.yml | 1 +
doc/_includes/_tutorial_expectations.liquid | 2 +-
.../install-compute-node.html.textile.liquid | 2 +-
doc/sdk/python/arvados-fuse.html.textile.liquid | 64 +++++
doc/user/cwl/cwl-extensions.html.textile.liquid | 10 +
.../tutorial-keep-mount.html.textile.liquid | 2 +-
lib/dispatchcloud/node_size.go | 43 ++--
sdk/cwl/arvados_cwl/__init__.py | 11 +-
sdk/cwl/arvados_cwl/arv-cwl-schema.yml | 20 ++
sdk/cwl/arvados_cwl/arvcontainer.py | 41 +++-
sdk/cwl/arvados_cwl/crunch_script.py | 1 +
sdk/cwl/arvados_cwl/runner.py | 4 +-
sdk/cwl/setup.py | 2 +-
sdk/cwl/tests/arvados-tests.yml | 12 +
sdk/cwl/tests/secret_test_job.yml | 1 +
sdk/cwl/tests/test_container.py | 115 ++++++++-
sdk/cwl/tests/test_submit.py | 176 +++++++++++++-
sdk/cwl/tests/wf/secret_job.cwl | 20 ++
sdk/cwl/tests/wf/secret_wf.cwl | 21 ++
sdk/python/arvados/__init__.py | 6 +-
sdk/python/arvados/commands/put.py | 35 ++-
sdk/python/tests/test_arv_put.py | 90 ++++++-
services/api/Gemfile | 10 +-
services/api/Gemfile.lock | 205 ++++++++--------
.../api/app/controllers/application_controller.rb | 3 +-
.../arvados/v1/container_requests_controller.rb | 1 +
.../arvados/v1/containers_controller.rb | 10 +
.../controllers/arvados/v1/schema_controller.rb | 2 +-
services/api/app/models/arvados_model.rb | 87 ++++---
services/api/app/models/blob.rb | 6 +-
services/api/app/models/commit.rb | 4 +-
services/api/app/models/container.rb | 91 +++++--
services/api/app/models/container_request.rb | 50 +++-
services/api/app/models/job.rb | 2 +-
services/api/config/initializers/lograge.rb | 12 +
services/api/config/routes.rb | 1 +
...180228220311_add_secret_mounts_to_containers.rb | 8 +
...80313180114_change_container_priority_bigint.rb | 5 +
services/api/db/structure.sql | 20 +-
.../request_error.rb} | 2 +-
services/api/test/fixtures/containers.yml | 27 +++
.../v1/container_requests_controller_test.rb | 74 +++++-
.../arvados/v1/containers_controller_test.rb | 22 +-
services/api/test/helpers/container_test_helper.rb | 15 ++
services/api/test/unit/container_request_test.rb | 235 +++++++++++++-----
services/api/test/unit/container_test.rb | 30 ++-
.../crunch-dispatch-slurm_test.go | 18 +-
services/crunch-dispatch-slurm/slurm.go | 9 +-
services/crunch-dispatch-slurm/squeue.go | 42 +++-
services/crunch-dispatch-slurm/squeue_test.go | 59 ++++-
services/crunch-run/crunchrun.go | 100 ++++++--
services/crunch-run/crunchrun_test.go | 161 +++++++++++-
services/crunch-run/logging_test.go | 9 +-
services/crunch-run/upload.go | 1 +
services/crunch-run/upload_test.go | 27 ++-
services/nodemanager/arvnodeman/jobqueue.py | 4 +-
tools/arvbox/bin/arvbox | 4 +-
.../arvbox/lib/arvbox/docker/service/workbench/run | 4 +-
.../arvbox/docker/service/workbench/run-service | 3 +-
72 files changed, 1828 insertions(+), 581 deletions(-)
create mode 120000 build/package-testing/test-package-python-cwltest.sh
copy tools/arvbox/lib/arvbox/docker/logger => build/package-testing/test-package-python27-python-cwltest.sh (74%)
mode change 100755 => 120000 build/package-testing/test-packages-debian9.sh
create mode 100644 doc/sdk/python/arvados-fuse.html.textile.liquid
create mode 100644 sdk/cwl/tests/secret_test_job.yml
create mode 100644 sdk/cwl/tests/wf/secret_job.cwl
create mode 100644 sdk/cwl/tests/wf/secret_wf.cwl
create mode 100644 services/api/db/migrate/20180228220311_add_secret_mounts_to_containers.rb
create mode 100644 services/api/db/migrate/20180313180114_change_container_priority_bigint.rb
copy services/api/{app/helpers/commit_ancestors_helper.rb => lib/request_error.rb} (74%)
create mode 100644 services/api/test/helpers/container_test_helper.rb
discards 1d162dacae4bf11a05489489309019d295317918 (commit)
discards 2e8332994b5f05c4d37eba1fed907efbf0643038 (commit)
discards 07fd33e72b2f275d96587561f88d095f6d4a5450 (commit)
discards ef8220f6180cdaf0642dbaf163590d9dc049b349 (commit)
discards 62899a1e2070f210f1306c97777a50c1137c19ec (commit)
discards 41d7cbeab78bd03c7f11c0b09c0d36912094c8a3 (commit)
discards 9cb03b25d8e5bf59a3fb2d4d899b68ffe5a86859 (commit)
discards f7e24e2250b978dd0a4a037bcb25d72cb3d167e3 (commit)
discards 63f7a48403b4c6c7ac50075e57768efaa39d71ca (commit)
discards 3c1f7f908be6dd39f1a6698e42c52896a933bfba (commit)
discards 41e13c8d8d3d62edc0cc15734bf139a2ae263982 (commit)
discards fe202ebe782d7c7ec0aea39731bc7d31fc2f08a0 (commit)
discards 3287a813d79679ac847e7dc8efd407580ff7b429 (commit)
discards cb1dd0bbd0e53328097014aab1cd79fe7e782853 (commit)
discards 5441f659157f3fbe190c0bb6c3107a7b7d704345 (commit)
discards 2d10f50f273a34077a989bbee6681724528e04c6 (commit)
discards 65c557035c0b36f0b2f0d4a602ca396e566eb158 (commit)
discards ada99960f879387bb5f3d2c20cf6a601c53b4bc4 (commit)
discards 1c5bb6c9dc070d7eb7619c8d1a32a496c89edc3e (commit)
discards 66e32efca2036a2c95dc2ece57764bc3486ae55f (commit)
discards 2f3b9a751367f13eeff08a0e59c2117f19c16310 (commit)
discards 8ec134dfc6384829c990a9cf70b675da55802037 (commit)
via 82c4ae9a2b4623b1901a436edd56e9a179ab9cde (commit)
via 16a544f9ab1aa5ec2e7a5a11caacd4f248c1616d (commit)
via ba8c08b62e130a64e11a9e90c2de0288c6a723aa (commit)
via fbee7a511b83751d6612e1f0508b0b74090ce51e (commit)
via 4c3606e14e0238d8cc3811e2eb121bfa298335c9 (commit)
via 5a503199cf39d332e56e21b16352c4b7a1175ead (commit)
via c23490637d9409bda7e6a3d5074fee8388d5bbc1 (commit)
via 9c951a17e6f761ecbdd90e4018de19f96de153fd (commit)
via 2b39c46517142a0fef4f541fa7662d4848a6d508 (commit)
via 9731438c983cddf3563948be650dc5c1f5f873b2 (commit)
via 7a20537bda47c5803ac94588ba431698c9b1d052 (commit)
via 36501543e4e2ccc6b69a25768e621989e4874056 (commit)
via 763091a26f84817fc98367625f3a2d268896d3da (commit)
via 9f280127a52939a0a59a368941caf78a86e051b1 (commit)
via 084372a72aecbc235797834b5ee27de15200c90f (commit)
via 9df91f986fcad8b498ea70c53862e29e7b4d6b38 (commit)
via 028486e135f2bf8169eba2730154546cc4d98da6 (commit)
via b496e11ab4a03909fb1f15264f3bc251897ad939 (commit)
via 0b9677ed8cd62d1b3c344949a3fced39d25cbc16 (commit)
via fccb5319aac8402bdb14b1fbeca08e00b73349ea (commit)
via 74bb01eb52cf08ca619bf33093fc3fb46544ef19 (commit)
via c9c4b387555ea9c85e52034dd18ca9a5ad417f73 (commit)
via fe346bd892c3bcd1ec18adabfe9c6cfa179fa8f6 (commit)
via ea8013a2d0cd0faeeec132f5d950fb3a5461d6ca (commit)
via f7fe9cc318046b1b24645e3345dd0e674184fe89 (commit)
via 7cf18615c7104bb59f1be54ca35e99f7ee7c5f27 (commit)
via 48006f58ed71ccff5de4f6aa0c1f19b7297cb0fb (commit)
via 247f218e49da73cfcd5b27a4990f16e3a3231ddd (commit)
via 853423204238e6a545e1e352c4142cf30e89586d (commit)
via 05bf879dfb195871e67eedecba6f654943c39250 (commit)
via 304a807e24363f3c38949b2da10c500f338d08b0 (commit)
via bc27c169f78471a21f6f5c35a879e4b57afa0e22 (commit)
via 4b563772c0dcbca24c75c0fe5aafab1009b0e3c7 (commit)
via 270b9295100b50419da8911ea080d025cd52d773 (commit)
via 5b5be8dfac71c7db9d5a966485fa04f24fd20957 (commit)
via 4de1b42b8b8538da3e4d16b1692c99824e51eb29 (commit)
via 5282d5462d86721c73849c2e5f3d057657c74b51 (commit)
via 6018e31ef8c2d344be0d596a1e8ca11d95bf0870 (commit)
via 787e1ba7d88bf854836c1ba75401447358ed4196 (commit)
via a9065fd962827b2cfae7993b550a386821a08dcb (commit)
via 16feb1a87c3e2e1955ad45caad0bd4b531f1cb26 (commit)
via d9b0587cbd570147f4fe7f955c73f8f1bf686cb7 (commit)
via 8f9afeaf64cdcbafbd26c461c91f8d19b3bff281 (commit)
via a3aaa7effb219c44224f61df115606bece3d294e (commit)
via 341f5b9ee96921018d80145712bba1200f9ea1a3 (commit)
via 04eca602e1bda34cfcfdd518d322050723de10d0 (commit)
via 34d4fa002c738c7a6ec1fdab4e12e748c8967f92 (commit)
via e73e1bc2eb23cb32eb55a5835157c4fbc0153eab (commit)
via 80081626101a2193d7b916fe488903b66777576e (commit)
via 9b590929d103537db6db9f8d1c6d7646413d16dd (commit)
via 4ad437853997c5fc84ca5183583178464e595cb5 (commit)
via d95c1cd6ca9a442b63d3ae7aeec4a3c1b257eb26 (commit)
via 149de8eb080d328ab033d17581733a637731e41a (commit)
via b4b8de21d5c324264b8473446e52e2f595df9039 (commit)
via d8fd2ad5bec258699da1f8892a69648f53d82ec8 (commit)
via bd703a2c3e59e0b419d6a4ac808ad30ffabde04d (commit)
via 59517612d335c30927eee45283d9d3cd4305c7fb (commit)
via f04ac7ef46a09cdb80a03cfb5b9fefea67602cd5 (commit)
via 77231f9a202692ae827a5e262ddc0b99ba5dd991 (commit)
via b20e9017fae4dc9876f4ffee56add1c58f3e3f21 (commit)
via 01126d2f7b8a9134615e0a5f0c933622750db937 (commit)
via 014ccf9cb540d85b153a592f8c882e523e5fa245 (commit)
via fe2c8a90b33dbbed8737198e72b61d13fe2601e3 (commit)
via 5bb01a77834c3a516d12e2fa347171a6a5a8b2f8 (commit)
via dae2b6ac89e8c95c04799f2c9baa4cb3db4d24ac (commit)
via be4418d2b701a98cee784615f5784b3fa2d4a4fb (commit)
via b77abbed6a747e46b98b1e8478158b27ff320151 (commit)
via d28a8e316ea10873f55a9d3e106dd0d7b26ab712 (commit)
via 0ee50ba86dd58c64384af28a55105421e8b0ad36 (commit)
via 61ed8053bd7aa76460ea0ac7a023c85a3f791ba9 (commit)
via 20153f57b0bebe11a12ee9462851c18342edff1f (commit)
via 0ecd6b502fbf721896d620c67502c8eb9ec4c0a7 (commit)
via 4176b6f82084d1bc2d55092f0b79c5723015bd51 (commit)
via 11ebfd6f35231691e2e10f9bf57c5af41d47d512 (commit)
via 4dd3d867e590ff54b9e2c1abeea879bcdf87c529 (commit)
via 50223437ddc7f06924d90cfd211b6d2819a4faae (commit)
via 9384e98ddf8c7d43a903558341bd14a03a260092 (commit)
via 68a21fcc6249024d3c0d39da9fbc6ae727fcda45 (commit)
via 4004c1e08f0d560736198437cee610b80d4a91b1 (commit)
via 98d6c8c5743e0fd6be85af3b9f30286a358bd1d4 (commit)
via 6d1ebf894a02151f751686003dc67ed4788d6c10 (commit)
via 98c6c6990061c546b9995ad70766589499fb4844 (commit)
via e8a18e3ebbcaf24812673f67e14edac7f8c28e41 (commit)
via 4ad88f00a73da6b4cbe11e2bde8d7a055ba6b60e (commit)
via 19ee2e029443d4d6de3df4a4e8bcb6ae9700475a (commit)
via 92474d902612ad28b3f9e5b5c21de08162d23ffb (commit)
via bab7938e562be6ce1305c15faaffb43aef67ff77 (commit)
via 55573affe3611054b88a17d3cc89c21b8bfa14e7 (commit)
via e1f97dcf68d197525228781e2a861cc3e64a0231 (commit)
via f7d0830ae819e2a62115642be449fa79f2fc8152 (commit)
via 885b200c41ca322477e5d7400d95c50eccf4b93f (commit)
via 53dc92af621bb2064e922b82e88572f5180c503a (commit)
via a67b550e12bcf12a8f67ef1472b2dce013747712 (commit)
via 96f657210ce401a84eafc4a575f56694f2b39a0b (commit)
via c04e0a81076b9e0c71bdd4f9b07b7ececf4d2685 (commit)
via 8682bb87e37e3ef9831dc83167a6620594fc8b52 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (1d162dacae4bf11a05489489309019d295317918)
\
N -- N -- N (82c4ae9a2b4623b1901a436edd56e9a179ab9cde)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 82c4ae9a2b4623b1901a436edd56e9a179ab9cde
Author: Javier Bértoli <jbertoli at veritasgenetics.com>
Date: Wed Mar 21 14:17:41 2018 -0300
My silly attempt
refs #13200
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 0bf1db6..a4820f0 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -264,13 +264,42 @@ test_package_presence() {
# See if we can skip building the package, only if it already exists in the
# processed/ directory. If so, move it back to the packages directory to make
# sure it gets picked up by the test and/or upload steps.
- if [[ -e "processed/$complete_pkgname" ]]; then
- echo "Package $complete_pkgname exists, not rebuilding!"
- mv processed/$complete_pkgname .
- return 1
+ # Get the list of packages from the repos
+
+ if [[ "$FORMAT" == "deb" ]]; then
+ debian_distros="jessie precise stretch trusty wheezy xenial"
+
+ for D in ${debian_distros}; do
+ if [ ${pkgname:0:3} = "lib" ]; then
+ repo_subdir=${pkgname:0:4}
+ else
+ repo_subdir=${pkgname:0:1}
+ fi
+
+ repo_pkg_list=$(curl -o - http://apt.arvados.org/pool/${D}/main/${repo_subdir}/)
+ echo ${repo_pkg_list} |grep -q ${pkgname}
+ if [ $? -eq 0 ]; then
+ echo "Package $complete_pkgname exists, not rebuilding!"
+ curl -o ./${pkgname} http://apt.arvados.org/pool/${D}/main/${repo_subdir}/${pkgname}
+ return 1
+ else
+ echo "Package $complete_pkgname not found, building"
+ return 0
+ fi
+ done
else
- echo "Package $complete_pkgname not found, building"
- return 0
+ centos_repo="http://rpm.arvados.org/CentOS/7/dev/x86_64"
+
+ repo_pkg_list=$(curl -o - ${centos_repo})
+ echo ${repo_pkg_list} |grep -q ${pkgname}
+ if [ $? -eq 0 ]; then
+ echo "Package $complete_pkgname exists, not rebuilding!"
+ curl -o ./${pkgname} ${centos_repo}/${repo_subdir}/${pkgname}
+ return 1
+ else
+ echo "Package $complete_pkgname not found, building"
+ return 0
+ fi
fi
}
commit 16a544f9ab1aa5ec2e7a5a11caacd4f248c1616d
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 20 18:17:01 2018 -0300
13200:test changes to not build package if no change is present
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index d031a30..0bf1db6 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -58,9 +58,9 @@ version_from_git() {
fi
declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
- ARVADOS_BUILDING_VERSION="${prefix}.$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+ ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
-}
+}
nohash_version_from_git() {
if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
commit ba8c08b62e130a64e11a9e90c2de0288c6a723aa
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 20 17:46:46 2018 -0300
13200:test changes to not build package if no change is present
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index cbb1cc7..d031a30 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -58,7 +58,7 @@ version_from_git() {
fi
declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
- ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+ ARVADOS_BUILDING_VERSION="${prefix}.$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
}
commit fbee7a511b83751d6612e1f0508b0b74090ce51e
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 20 17:10:51 2018 -0300
13200:test changes to not build package if no change is present
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 12cb408..cbb1cc7 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -67,7 +67,7 @@ nohash_version_from_git() {
echo "$ARVADOS_BUILDING_VERSION"
return
fi
- version_from_git $1 | cut -d. -f1-3
+ version_from_git $1 | cut -d. -f1-4
}
timestamp_from_git() {
@@ -76,7 +76,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$(version_from_git).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$(nohash_version_from_git).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
commit 4c3606e14e0238d8cc3811e2eb121bfa298335c9
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 20 16:43:49 2018 -0300
13200:test changes to not build package if no change is present
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 497545d..a302997 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
diff --git a/build/run-library.sh b/build/run-library.sh
index 04add5c..12cb408 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@ -50,9 +50,14 @@ version_from_git() {
return
fi
- local git_ts
+ local git_ts git_hash prefix
+ if [[ -n "$1" ]] ; then
+ prefix="$1"
+ else
+ prefix="0.1"
+ fi
- declare $(format_last_commit_here "git_ts=%ct")
+ declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
}
@@ -71,7 +76,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$(version_from_git).$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$(version_from_git).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
commit 5a503199cf39d332e56e21b16352c4b7a1175ead
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 20 15:39:48 2018 -0300
13200:small change to output and to test if python packages are rebuilt when there is no change
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 788e3db..04add5c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
commit c23490637d9409bda7e6a3d5074fee8388d5bbc1
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 19 14:47:58 2018 -0300
13200:small change to output and to test if python packages are rebuilt when there is no change
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index a302997..497545d 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
commit 9c951a17e6f761ecbdd90e4018de19f96de153fd
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 19 14:09:47 2018 -0300
13200:small change to output and to test if python packages are rebuilt when there is no change
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 497545d..a302997 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
commit 2b39c46517142a0fef4f541fa7662d4848a6d508
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 19 12:20:30 2018 -0300
13200:test run library
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 04add5c..788e3db 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
commit 9731438c983cddf3563948be650dc5c1f5f873b2
Author: Nico Cesar <ncesar at veritasgenetics.com>
Date: Mon Mar 19 10:18:09 2018 -0400
13200: minor changes to make it more readable
Arvados-DCO-1.1-Signed-off-by: Nico Cesar ncesar at veritasgenetics.com
diff --git a/build/run-library.sh b/build/run-library.sh
index 6c3b619..04add5c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -50,11 +50,10 @@ version_from_git() {
return
fi
- ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
local git_ts
declare $(format_last_commit_here "git_ts=%ct")
- ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+ ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
}
commit 7a20537bda47c5803ac94588ba431698c9b1d052
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Fri Mar 16 14:56:07 2018 -0300
13200:fix python version with git from tag
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index a79256d..497545d 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@ -385,7 +385,7 @@ package_go_binary tools/keep-exercise keep-exercise \
# 2014-05-15
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/sdk/python/build"
-arvados_python_client_version="$(version_from_git)"
+arvados_python_client_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)}
test_package_presence ${PYTHON2_PKG_PREFIX}-arvados-python-client "$arvados_python_client_version" python
if [[ "$?" == "0" ]]; then
fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$arvados_python_client_version" "--url=https://arvados.org" "--description=The Arvados Python SDK" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --deb-recommends=git
@@ -394,7 +394,7 @@ fi
# cwl-runner
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/sdk/cwl/build"
-arvados_cwl_runner_version="$(version_from_git)"
+arvados_cwl_runner_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/cwl/arvados_cwl_runner.egg-info/PKG-INFO)}
declare -a iterargs=()
if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then
arvados_cwl_runner_iteration=3
@@ -451,7 +451,7 @@ fi
# not omit the python- prefix first.
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/fuse/build"
-arvados_fuse_version="$(version_from_git)"
+arvados_fuse_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)}
test_package_presence "${PYTHON2_PKG_PREFIX}-arvados-fuse" "$arvados_fuse_version" python
if [[ "$?" == "0" ]]; then
fpm_build $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$arvados_fuse_version" "--url=https://arvados.org" "--description=The Keep FUSE driver" --depends "${PYTHON2_PKG_PREFIX}-setuptools"
@@ -469,7 +469,7 @@ fi
# The Docker image cleaner
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/dockercleaner/build"
-dockercleaner_version="$(version_from_git)"
+dockercleaner_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/dockercleaner/arvados_docker_cleaner.egg-info/PKG-INFO)}
iteration="${ARVADOS_BUILDING_ITERATION:-3}"
test_package_presence arvados-docker-cleaner "$dockercleaner_version" python "$iteration"
if [[ "$?" == "0" ]]; then
@@ -478,7 +478,7 @@ fi
# The Arvados crunchstat-summary tool
cd $WORKSPACE/packages/$TARGET
-crunchstat_summary_version="$(version_from_git)"
+crunchstat_summary_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/tools/crunchstat-summary/crunchstat_summary.egg-info/PKG-INFO)}
iteration="${ARVADOS_BUILDING_ITERATION:-2}"
test_package_presence "$PYTHON2_PKG_PREFIX"-crunchstat-summary "$crunchstat_summary_version" python "$iteration"
if [[ "$?" == "0" ]]; then
commit 36501543e4e2ccc6b69a25768e621989e4874056
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Fri Mar 16 14:37:54 2018 -0300
13200:fix python version with git from tag
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index dce3aa8..a79256d 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -385,7 +385,7 @@ package_go_binary tools/keep-exercise keep-exercise \
# 2014-05-15
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/sdk/python/build"
-arvados_python_client_version="$version_from_git()"
+arvados_python_client_version="$(version_from_git)"
test_package_presence ${PYTHON2_PKG_PREFIX}-arvados-python-client "$arvados_python_client_version" python
if [[ "$?" == "0" ]]; then
fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$arvados_python_client_version" "--url=https://arvados.org" "--description=The Arvados Python SDK" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --deb-recommends=git
@@ -394,7 +394,7 @@ fi
# cwl-runner
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/sdk/cwl/build"
-arvados_cwl_runner_version="$version_from_git()"
+arvados_cwl_runner_version="$(version_from_git)"
declare -a iterargs=()
if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then
arvados_cwl_runner_iteration=3
@@ -451,7 +451,7 @@ fi
# not omit the python- prefix first.
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/fuse/build"
-arvados_fuse_version="$version_from_git()"
+arvados_fuse_version="$(version_from_git)"
test_package_presence "${PYTHON2_PKG_PREFIX}-arvados-fuse" "$arvados_fuse_version" python
if [[ "$?" == "0" ]]; then
fpm_build $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$arvados_fuse_version" "--url=https://arvados.org" "--description=The Keep FUSE driver" --depends "${PYTHON2_PKG_PREFIX}-setuptools"
@@ -469,7 +469,7 @@ fi
# The Docker image cleaner
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/dockercleaner/build"
-dockercleaner_version="$version_from_git()"
+dockercleaner_version="$(version_from_git)"
iteration="${ARVADOS_BUILDING_ITERATION:-3}"
test_package_presence arvados-docker-cleaner "$dockercleaner_version" python "$iteration"
if [[ "$?" == "0" ]]; then
@@ -478,7 +478,7 @@ fi
# The Arvados crunchstat-summary tool
cd $WORKSPACE/packages/$TARGET
-crunchstat_summary_version="$version_from_git()"
+crunchstat_summary_version="$(version_from_git)"
iteration="${ARVADOS_BUILDING_ITERATION:-2}"
test_package_presence "$PYTHON2_PKG_PREFIX"-crunchstat-summary "$crunchstat_summary_version" python "$iteration"
if [[ "$?" == "0" ]]; then
commit 763091a26f84817fc98367625f3a2d268896d3da
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Fri Mar 16 14:28:44 2018 -0300
13200:fix python gittagers version with latest git tag and timestamp
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index e1c9f02..dce3aa8 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -385,7 +385,7 @@ package_go_binary tools/keep-exercise keep-exercise \
# 2014-05-15
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/sdk/python/build"
-arvados_python_client_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)}
+arvados_python_client_version="$version_from_git()"
test_package_presence ${PYTHON2_PKG_PREFIX}-arvados-python-client "$arvados_python_client_version" python
if [[ "$?" == "0" ]]; then
fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$arvados_python_client_version" "--url=https://arvados.org" "--description=The Arvados Python SDK" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --deb-recommends=git
@@ -394,7 +394,7 @@ fi
# cwl-runner
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/sdk/cwl/build"
-arvados_cwl_runner_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/cwl/arvados_cwl_runner.egg-info/PKG-INFO)}
+arvados_cwl_runner_version="$version_from_git()"
declare -a iterargs=()
if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then
arvados_cwl_runner_iteration=3
@@ -451,7 +451,7 @@ fi
# not omit the python- prefix first.
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/fuse/build"
-arvados_fuse_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)}
+arvados_fuse_version="$version_from_git()"
test_package_presence "${PYTHON2_PKG_PREFIX}-arvados-fuse" "$arvados_fuse_version" python
if [[ "$?" == "0" ]]; then
fpm_build $WORKSPACE/services/fuse "${PYTHON2_PKG_PREFIX}-arvados-fuse" 'Curoverse, Inc.' 'python' "$arvados_fuse_version" "--url=https://arvados.org" "--description=The Keep FUSE driver" --depends "${PYTHON2_PKG_PREFIX}-setuptools"
@@ -469,7 +469,7 @@ fi
# The Docker image cleaner
cd $WORKSPACE/packages/$TARGET
rm -rf "$WORKSPACE/services/dockercleaner/build"
-dockercleaner_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/dockercleaner/arvados_docker_cleaner.egg-info/PKG-INFO)}
+dockercleaner_version="$version_from_git()"
iteration="${ARVADOS_BUILDING_ITERATION:-3}"
test_package_presence arvados-docker-cleaner "$dockercleaner_version" python "$iteration"
if [[ "$?" == "0" ]]; then
@@ -478,7 +478,7 @@ fi
# The Arvados crunchstat-summary tool
cd $WORKSPACE/packages/$TARGET
-crunchstat_summary_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/tools/crunchstat-summary/crunchstat_summary.egg-info/PKG-INFO)}
+crunchstat_summary_version="$version_from_git()"
iteration="${ARVADOS_BUILDING_ITERATION:-2}"
test_package_presence "$PYTHON2_PKG_PREFIX"-crunchstat-summary "$crunchstat_summary_version" python "$iteration"
if [[ "$?" == "0" ]]; then
commit 9f280127a52939a0a59a368941caf78a86e051b1
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Fri Mar 16 13:24:17 2018 -0300
13200:fix python gittagers version with latest git tag and timestamp
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 497545d..e1c9f02 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
diff --git a/build/run-library.sh b/build/run-library.sh
index 83d069c..6c3b619 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
- #!/bin/bash
+#!/bin/bash
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@ -72,7 +72,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$(version_from_git).$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index e832138..752633a 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "1.0"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 5804517..88bf51e 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "0.1"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 1506c20..6a6a96a 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "0.1"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 437e95e..454c24e 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "0.1"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
commit 084372a72aecbc235797834b5ee27de15200c90f
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Wed Mar 14 16:24:15 2018 -0300
13200:fix python gittagers version with latest git tag and timestamp
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 9f77cb8..83d069c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -52,6 +52,7 @@ version_from_git() {
ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
local git_ts
+
declare $(format_last_commit_here "git_ts=%ct")
ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
@@ -71,7 +72,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 752633a..e832138 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = "1.0"
+ version = ""
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 88bf51e..5804517 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = "0.1"
+ version = ""
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 6a6a96a..1506c20 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = "0.1"
+ version = ""
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 454c24e..437e95e 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = "0.1"
+ version = ""
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
commit 9df91f986fcad8b498ea70c53862e29e7b4d6b38
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Wed Mar 14 15:48:26 2018 -0300
13200:fix python gittagers version with latest git tag and timestamp
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 5db8fd2..9f77cb8 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -52,12 +52,6 @@ version_from_git() {
ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
local git_ts
- if [[ -n "$1" ]] ; then
- prefix="$1"
- else
- prefix="0.1"
- fi
-
declare $(format_last_commit_here "git_ts=%ct")
ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
@@ -77,7 +71,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index da5ae3b..40f6e6c 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -41,5 +41,5 @@ class EggInfoFromGit(egg_info):
def tags(self):
if self.tag_build is None:
- self.tag_build = self.git_timestamp_tag() + self.git_latest_tag()
+ self.tag_build = self.git_latest_tag() + self.git_timestamp_tag()
return egg_info.tags(self)
commit 028486e135f2bf8169eba2730154546cc4d98da6
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Wed Mar 14 14:15:45 2018 -0300
13200:fix python gittagers version with latest git tag and timestamp
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 9081c22..5db8fd2 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -59,7 +59,8 @@ version_from_git() {
fi
declare $(format_last_commit_here "git_ts=%ct")
- echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+ ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+ echo "$ARVADOS_BUILDING_VERSION"
}
nohash_version_from_git() {
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 3fb0fde..da5ae3b 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -28,6 +28,10 @@ class EggInfoFromGit(egg_info):
If a build tag has already been set (e.g., "egg_info -b", building
from source package), leave it alone.
"""
+ def git_latest_tag(self):
+ gitinfo = subprocess.check_output(
+ ['git', 'describe', '--abbrev=0']).strip()
+ return str(gitinfo)
def git_timestamp_tag(self):
gitinfo = subprocess.check_output(
@@ -37,5 +41,5 @@ class EggInfoFromGit(egg_info):
def tags(self):
if self.tag_build is None:
- self.tag_build = self.git_timestamp_tag()
+ self.tag_build = self.git_timestamp_tag() + self.git_latest_tag()
return egg_info.tags(self)
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index da73634..4e848ed 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -12,6 +12,11 @@ class EggInfoFromGit(egg_info):
If a build tag has already been set (e.g., "egg_info -b", building
from source package), leave it alone.
"""
+ def git_latest_tag(self):
+ gitinfo = subprocess.check_output(
+ ['git', 'describe', '--abbrev=0']).strip()
+ return str(gitinfo)
+
def git_timestamp_tag(self):
gitinfo = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
@@ -20,5 +25,5 @@ class EggInfoFromGit(egg_info):
def tags(self):
if self.tag_build is None:
- self.tag_build = self.git_timestamp_tag()
+ self.tag_build = self.git_latest_tag()+self.git_timestamp_tag()
return egg_info.tags(self)
commit b496e11ab4a03909fb1f15264f3bc251897ad939
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 13 11:11:29 2018 -0300
13200:fix python package version with latest git tag and timestamp
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index d3a6272..9081c22 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -76,7 +76,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$(nohash_version_from_git).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
commit 0b9677ed8cd62d1b3c344949a3fced39d25cbc16
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 12 15:26:06 2018 -0300
13200:new version using git tag latest and timestamp only
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 96ccf48..d3a6272 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -50,7 +50,7 @@ version_from_git() {
return
fi
- $ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
+ ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
local git_ts
if [[ -n "$1" ]] ; then
prefix="$1"
commit fccb5319aac8402bdb14b1fbeca08e00b73349ea
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 12 15:12:22 2018 -0300
13200:new version using git tag latest and timestamp only
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index a9e6202..96ccf48 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -46,12 +46,20 @@ version_from_git() {
# dev/prerelease, output a version number based on the git log for
# the current working directory.
if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
- local git_ts git_hash prefix
- declare $(format_last_commit_here "git_ts=%ct")
- echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
- return
+ echo "$ARVADOS_BUILDING_VERSION"
+ return
+ fi
+
+ $ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
+ local git_ts
+ if [[ -n "$1" ]] ; then
+ prefix="$1"
+ else
+ prefix="0.1"
fi
+ declare $(format_last_commit_here "git_ts=%ct")
+ echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
}
nohash_version_from_git() {
commit 74bb01eb52cf08ca619bf33093fc3fb46544ef19
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 12 13:05:56 2018 -0300
13200:test new job with timestamp only removing hash
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index df86dee..a9e6202 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -46,19 +46,12 @@ version_from_git() {
# dev/prerelease, output a version number based on the git log for
# the current working directory.
if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
- echo "$ARVADOS_BUILDING_VERSION"
- return
- fi
-
- local git_ts git_hash prefix
- if [[ -n "$1" ]] ; then
- prefix="$1"
- else
- prefix="0.1"
+ local git_ts git_hash prefix
+ declare $(format_last_commit_here "git_ts=%ct")
+ echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+ return
fi
- declare $(format_last_commit_here "git_ts=%ct")
- echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
}
nohash_version_from_git() {
commit c9c4b387555ea9c85e52034dd18ca9a5ad417f73
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Thu Mar 8 17:19:15 2018 -0300
13200:test new job with timestamp only removing hash
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index ba94688..df86dee 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+ #!/bin/bash
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@ -57,8 +57,8 @@ version_from_git() {
prefix="0.1"
fi
- declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
- echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash"
+ declare $(format_last_commit_here "git_ts=%ct")
+ echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
}
nohash_version_from_git() {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list