[ARVADOS] updated: 1.1.3-169-g5022343

Git user git at public.curoverse.com
Fri Mar 9 15:29:54 EST 2018


Summary of changes:
 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 +---------------------
 4 files changed, 8 insertions(+), 43 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

       via  50223437ddc7f06924d90cfd211b6d2819a4faae (commit)
      from  98d6c8c5743e0fd6be85af3b9f30286a358bd1d4 (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 50223437ddc7f06924d90cfd211b6d2819a4faae
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Mar 9 15:29:22 2018 -0500

    Fix packaging for python-cwltest.  refs #13140
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/build/build.list b/build/build.list
index a216e67..da7c030 100644
--- a/build/build.list
+++ b/build/build.list
@@ -14,7 +14,7 @@ debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|uritemplate|3.0.0|2|pyt
 debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|httplib2|0.9.2|3|python|all
 debian8,debian9,ubuntu1204,centos7|ws4py|0.3.5|2|python|all
 debian8,debian9,ubuntu1204,centos7|pykka|1.2.1|2|python|all
-debian8,debian9,ubuntu1204,ubuntu1404|six|1.10.0|2|python|all
+debian8,debian9,ubuntu1204,ubuntu1404,centos7|six|1.10.0|2|python|all
 debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|ciso8601|1.0.3|3|python|amd64
 debian8,debian9,ubuntu1204,centos7|pycrypto|2.6.1|3|python|amd64
 debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604|backports.ssl_match_hostname|3.5.0.1|2|python|all
@@ -41,8 +41,9 @@ centos7|pbr|0.11.1|2|python|all
 centos7|pyparsing|2.1.10|2|python|all
 centos7|keepalive|0.5|2|python|all
 debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|lockfile|0.12.2|2|python|all|--epoch 1
+debian8,ubuntu1404,centos7|subprocess32|3.2.7|2|python|all
 all|ruamel.yaml|0.13.7|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed
-all|cwltest|1.0.20180209171722|3|python|all|--depends 'python-futures >= 3.0.5'
+all|cwltest|1.0.20180209171722|4|python|all|--depends 'python-futures >= 3.0.5' --depends 'python-subprocess32'
 all|junit-xml|1.7|3|python|all
 all|rdflib-jsonld|0.4.0|2|python|all
 all|futures|3.0.5|2|python|all
diff --git a/build/package-testing/test-package-python-cwltest.sh b/build/package-testing/test-package-python-cwltest.sh
new file mode 120000
index 0000000..9b6545b
--- /dev/null
+++ b/build/package-testing/test-package-python-cwltest.sh
@@ -0,0 +1 @@
+test-package-python27-python-cwltest.sh
\ No newline at end of file
diff --git a/build/package-testing/test-package-python27-python-cwltest.sh b/build/package-testing/test-package-python27-python-cwltest.sh
new file mode 100755
index 0000000..395cefc
--- /dev/null
+++ b/build/package-testing/test-package-python27-python-cwltest.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+exec python <<EOF
+import cwltest
+EOF
diff --git a/build/package-testing/test-packages-debian9.sh b/build/package-testing/test-packages-debian9.sh
deleted file mode 100755
index b4ea35c..0000000
--- a/build/package-testing/test-packages-debian9.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-set -eu
-
-# Multiple .deb based distros symlink to this script, so extract the target
-# from the invocation path.
-target=$(echo $0 | sed 's/.*test-packages-\([^.]*\)\.sh.*/\1/')
-
-export ARV_PACKAGES_DIR="/arvados/packages/$target"
-
-dpkg-query --show > "$ARV_PACKAGES_DIR/$1.before"
-
-apt-get -qq update
-apt-get --assume-yes --allow-unauthenticated install "$1"
-
-dpkg-query --show > "$ARV_PACKAGES_DIR/$1.after"
-
-set +e
-diff "$ARV_PACKAGES_DIR/$1.before" "$ARV_PACKAGES_DIR/$1.after" > "$ARV_PACKAGES_DIR/$1.diff"
-set -e
-
-mkdir -p /tmp/opts
-cd /tmp/opts
-
-export ARV_PACKAGES_DIR="/arvados/packages/$target"
-
-dpkg-deb -x $(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1) .
-
-while read so && [ -n "$so" ]; do
-    echo
-    echo "== Packages dependencies for $so =="
-    ldd "$so" | awk '($3 ~ /^\//){print $3}' | sort -u | xargs dpkg -S | cut -d: -f1 | sort -u
-done <<EOF
-$(find -name '*.so')
-EOF
-
-exec /jenkins/package-testing/common-test-packages.sh "$1"
diff --git a/build/package-testing/test-packages-debian9.sh b/build/package-testing/test-packages-debian9.sh
new file mode 120000
index 0000000..54ce94c
--- /dev/null
+++ b/build/package-testing/test-packages-debian9.sh
@@ -0,0 +1 @@
+deb-common-test-packages.sh
\ No newline at end of file

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list