Merge branch 'master' into 7370-package-install-testing

[arvados-dev.git] / jenkins / run-cwl-tests.sh

diff --git a/jenkins/run-cwl-tests.sh b/jenkins/run-cwl-tests.sh
index 917365d96dc8d66398efa27b0b87cee2fafecb2e..53c0538efd27cdf50d8353625de0c68023c16521 100755 (executable)
--- a/jenkins/run-cwl-tests.sh
+++ b/jenkins/run-cwl-tests.sh
@@ -156,40 +156,63 @@ fi
 
 cd "$WORKSPACE"
 
-# We use $WORKSPACE as the clean directory from which to build the cwltool package
-if [[ ! -d "$WORKSPACE/.git" ]]; then
-  if [[ "$DEBUG" != 0 ]]; then
-    git clone https://github.com/common-workflow-language/common-workflow-language.git .
-  else
-    git clone -q https://github.com/common-workflow-language/common-workflow-language.git .
-  fi
-fi
-
-if [[ "$DEBUG" != 0 ]]; then
-  git checkout master
-  git pull
+if test -d cwltool ; then
+    (cd cwltool
+     git fetch
+     git reset --hard origin/master
+    )
 else
-  git checkout -q master
-  git pull -q
+    git clone git@github.com:common-workflow-language/cwltool.git
+    (cd cwltool
+     git config user.email "sysadmin@curoverse.com"
+     git config user.name "Curoverse build bot"
+    )
 fi
 
-pushd reference
-python setup.py install
-python setup.py test
-./docker-node-engine.sh
-popd
+(cd cwltool
+ python setup.py install
+ python setup.py test
+ ./build-node-docker.sh
+)
+
+./run_test.sh RUNNER=cwltool/cwltool/main.py DRAFT=draft-2
+./run_test.sh RUNNER=cwltool/cwltool/main.py DRAFT=draft-3
 
-pushd conformance
-pwd
-./run_test.sh
-popd
+(cd cwltool
+ handle_python_package
+)
 
-cd reference
-handle_python_package
+(cd cwltool/cwl-runner
+ handle_python_package
+)
 
-./build-cwl-docker.sh
+(cd cwltool
+ ./build-cwl-docker.sh
+)
 
 if [[ "$UPLOAD_DOCKER" != 0 ]]; then
+    docker push commonworkflowlanguage/cwltool_module
     docker push commonworkflowlanguage/cwltool
     docker push commonworkflowlanguage/nodejs-engine
 fi
+
+if test -d common-workflow-language.github.io ; then
+    (cd common-workflow-language.github.io
+     git fetch
+     git reset --hard origin/master
+    )
+else
+    git clone git@github.com:common-workflow-language/common-workflow-language.github.io.git
+    (cd common-workflow-language.github.io
+     git config user.email "sysadmin@curoverse.com"
+     git config user.name "Curoverse build bot"
+    )
+fi
+
+python -mcwltool --outdir=$PWD/common-workflow-language.github.io site/cwlsite.cwl site/cwlsite-job.json
+
+(cd common-workflow-language.github.io
+ git add --all
+ git diff-index --quiet HEAD || git commit -m"Build bot"
+ git push
+)