[ARVADOS] created: 1.3.0-2584-gc44aa637f

[Git user]

        at  c44aa637f62f4f0943172ccdcc3e3031c5b838c0 (commit)


commit c44aa637f62f4f0943172ccdcc3e3031c5b838c0
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu May 14 20:57:49 2020 -0400

    bugfix: fix arvados-node-manager package build
    
    refs #16373
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 45fc231d7..7dc293ab6 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -673,9 +673,9 @@ fpm_build_virtualenv () {
   done
 
   # make sure the systemd service file ends up in the right place
-  # currently only used by arvados-docker-cleaner
+  # used by arvados-docker-cleaner and arvados-node-manager
   if [[ -e "${systemd_unit}" ]]; then
-    COMMAND_ARR+=("usr/share/python3/dist/$PKG/share/doc/$PKG/$PKG.service=/lib/systemd/system/$PKG.service")
+    COMMAND_ARR+=("usr/share/$python/dist/$PKG/share/doc/$PKG/$PKG.service=/lib/systemd/system/$PKG.service")
   fi
 
   COMMAND_ARR+=("${fpm_args[@]}")

commit 23113256088d36496b8b70f35a2da3d2d8710666
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu May 14 20:40:55 2020 -0400

    16434: add a basic execution test for the python3-arvados-cwl-runner packages
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/build/package-testing/test-package-python3-arvados-cwl-runner.sh b/build/package-testing/test-package-python3-arvados-cwl-runner.sh
new file mode 100755
index 000000000..99327c016
--- /dev/null
+++ b/build/package-testing/test-package-python3-arvados-cwl-runner.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+set -e
+
+arvados-cwl-runner --version

commit 7322b919a6021e65859e482a52aa30bee74b7a89
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu May 14 20:40:14 2020 -0400

    Fix comment typos in run-library.sh
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index beb23f563..45fc231d7 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -465,7 +465,7 @@ fpm_build_virtualenv () {
   fi
 
   # arvados-python-client sdist should always be built, to be available
-  # for other dependant packages.
+  # for other dependent packages.
   if [[ -n "$ONLY_BUILD" ]] && [[ "arvados-python-client" != "$PKG" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]] && [[ "$PKG" != "$ONLY_BUILD" ]]; then
     return 0
   fi
@@ -613,7 +613,7 @@ fpm_build_virtualenv () {
   # 12271 - As FPM-generated packages don't include scripts by default, the
   # packages cleanup on upgrade depends on files being listed on the %files
   # section in the generated SPEC files. To remove DIRECTORIES, they need to
-  # be listed in that sectiontoo, so we need to add this parameter to properly
+  # be listed in that section too, so we need to add this parameter to properly
   # remove lingering dirs. But this only works for python2: if used on
   # python33, it includes dirs like /opt/rh/python33 that belong to
   # other packages.

commit e05bd78813f575d61093a0685af775d431021678
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu May 14 20:39:13 2020 -0400

    16434: the python3-arvados-cwl-runner packages on Debian 10 and Ubuntu
    18.04 (and later, presumably) have a dependency on the
    python3-distutils package.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/sdk/cwl/fpm-info.sh b/sdk/cwl/fpm-info.sh
index 4a32a21e3..66176b940 100644
--- a/sdk/cwl/fpm-info.sh
+++ b/sdk/cwl/fpm-info.sh
@@ -6,9 +6,12 @@ case "$TARGET" in
     debian8)
         fpm_depends+=(libgnutls-deb0-28 libcurl3-gnutls)
         ;;
-    debian* | ubuntu*)
+    debian9 | ubuntu1604)
         fpm_depends+=(libcurl3-gnutls)
         ;;
+    debian* | ubuntu*)
+        fpm_depends+=(libcurl3-gnutls python3-distutils)
+        ;;
 esac
 
 fpm_args+=(--conflicts=python-cwltool --conflicts=cwltool)

commit e9e56eca5f6332cd65b4b50e3ed1480780c10ac4
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu May 14 20:30:05 2020 -0400

    We only build the python3 version of the arvados-cwl-runner package now.
    
    refs #12409
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/sdk/cwl/fpm-info.sh b/sdk/cwl/fpm-info.sh
index 5c47532db..4a32a21e3 100644
--- a/sdk/cwl/fpm-info.sh
+++ b/sdk/cwl/fpm-info.sh
@@ -7,7 +7,7 @@ case "$TARGET" in
         fpm_depends+=(libgnutls-deb0-28 libcurl3-gnutls)
         ;;
     debian* | ubuntu*)
-        fpm_depends+=(libcurl3-gnutls libpython2.7)
+        fpm_depends+=(libcurl3-gnutls)
         ;;
 esac
 

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


hooks/post-receive
--