[ARVADOS] updated: 2705c8a3ffd97399e81bca102f6a929d525e3fb7

[Git user]

Summary of changes:
 tools/workflow-importer/setup-hook.sh              | 39 ++++++++++++++++++++++
 tools/workflow-importer/setup.py                   | 18 ++++++++++
 .../workflow-importer/workflowimporter.py          |  3 ++
 3 files changed, 60 insertions(+)
 create mode 100755 tools/workflow-importer/setup-hook.sh
 create mode 100644 tools/workflow-importer/setup.py
 rename {services => tools}/workflow-importer/workflowimporter.py (99%)

       via  2705c8a3ffd97399e81bca102f6a929d525e3fb7 (commit)
       via  a62577f5acf4ff6af4ab13eb1717b56308470c91 (commit)
      from  86e1e57cc9761e1a4f8f6ae9434e033a1ecd41d0 (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 2705c8a3ffd97399e81bca102f6a929d525e3fb7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Oct 28 11:41:45 2016 -0400

    10344: Move to tools

diff --git a/services/workflow-importer/setup-hook.sh b/tools/workflow-importer/setup-hook.sh
similarity index 100%
rename from services/workflow-importer/setup-hook.sh
rename to tools/workflow-importer/setup-hook.sh
diff --git a/services/workflow-importer/setup.py b/tools/workflow-importer/setup.py
similarity index 100%
rename from services/workflow-importer/setup.py
rename to tools/workflow-importer/setup.py
diff --git a/services/workflow-importer/workflowimporter.py b/tools/workflow-importer/workflowimporter.py
similarity index 100%
rename from services/workflow-importer/workflowimporter.py
rename to tools/workflow-importer/workflowimporter.py

commit a62577f5acf4ff6af4ab13eb1717b56308470c91
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Oct 28 11:35:29 2016 -0400

    10344: Script to setup workflow import post-commit and post-update hooks.

diff --git a/services/workflow-importer/setup-hook.sh b/services/workflow-importer/setup-hook.sh
new file mode 100755
index 0000000..9c162c1
--- /dev/null
+++ b/services/workflow-importer/setup-hook.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+set -e
+GIT_DIR=$1
+
+if test -d "$GIT_DIR/.git" ; then
+    GIT_DIR="$GIT_DIR/.git"
+fi
+
+virtualenv $GIT_DIR/hooks/workflowimport
+. $GIT_DIR/hooks/workflowimport/bin/activate
+pip install -U setuptools
+python setup.py install
+
+cat >$GIT_DIR/hooks/post-commit <<EOF
+#!/bin/sh
+if test -z "\$ARVADOS_API_HOST" ; then
+  ARVADOS_API_HOST="$ARVADOS_API_HOST"
+fi
+if test -z "\$ARVADOS_API_HOST_INSECURE" ; then
+  ARVADOS_API_HOST_INSECURE="$ARVADOS_API_HOST_INSECURE"
+fi
+if test -z "\$ARVADOS_API_TOKEN" ; then
+  ARVADOS_API_TOKEN="$ARVADOS_API_TOKEN"
+fi
+export ARVADOS_API_HOST ARVADOS_API_TOKEN ARVADOS_API_HOST_INSECURE
+unset GIT_DIR
+EOF
+
+cp $GIT_DIR/hooks/post-commit $GIT_DIR/hooks/post-update
+chmod +x $GIT_DIR/hooks/post-commit
+chmod +x $GIT_DIR/hooks/post-update
+
+cat >>$GIT_DIR/hooks/post-commit <<EOF
+exec $GIT_DIR/hooks/workflowimport/bin/workflowimporter.py \$PWD \$(git branch | grep "^*" | cut -c3-)
+EOF
+
+cat >>$GIT_DIR/hooks/post-update <<EOF
+exec $GIT_DIR/hooks/workflowimport/bin/workflowimporter.py \$PWD \$1
+EOF
diff --git a/services/workflow-importer/setup.py b/services/workflow-importer/setup.py
new file mode 100644
index 0000000..a617544
--- /dev/null
+++ b/services/workflow-importer/setup.py
@@ -0,0 +1,18 @@
+from setuptools import setup, find_packages
+setup(name='arvados-workflow-import',
+      version='0.1',
+      description='Arvados workflow import',
+      author='Arvados',
+      author_email='info at arvados.org',
+      url="https://arvados.org",
+      download_url="https://github.com/curoverse/arvados.git",
+      license='Apache 2.0',
+      packages=find_packages(),
+      scripts=[
+          'workflowimporter.py'
+      ],
+      install_requires=[
+          'arvados-cwl-runner'
+      ],
+      zip_safe=True
+      )
diff --git a/services/workflow-importer/workflowimporter.py b/services/workflow-importer/workflowimporter.py
index ab72bf1..a3e24c1 100755
--- a/services/workflow-importer/workflowimporter.py
+++ b/services/workflow-importer/workflowimporter.py
@@ -41,6 +41,9 @@ def registerDocker((api, reporecord, prefix, branch), dirname, names):
         tagname = name+"-"+tagname
     else:
         tagname = name
+
+    branch = branch.split("/")[-1]
+
     os.chdir(dirname)
     subprocess.check_call(["docker", "build", "--tag=%s:%s" % (tagname, branch), "."])
     try:

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


hooks/post-receive
--