match matrix project layout

Author: mr-c

jenkins.bash

@@ -13,6 +13,7 @@ venv() {
 	# shellcheck source=/dev/null
         source "$1"/bin/activate
 }
+git clean --force -d -x || /bin/true
 cloneorpull common-workflow-language https://github.com/common-workflow-language/common-workflow-language.git
 venv cwltool-venv
 docker pull node:slim
@@ -22,14 +23,14 @@ python setup.py install
 pip install "cwltest>=1.0.20160825151655"
 pushd common-workflow-language
 git clean --force -d -x || /bin/true
-./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-3 && \
-	./run_test.sh --junit-xml=result.xml RUNNER=cwltool && \
-	./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=v1.1.0-dev1 EXTRA=--enable-dev
+if [ $version = *dev ] then
+	EXTRA="EXTRA=--enable-dev"
+./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=${version} ${EXTRA}
 CODE=$?
 popd
 if [ "$GIT_BRANCH" = "origin/master" ]
 then
   ./build-cwl-docker.sh && docker push commonworkflowlanguage/cwltool_module && docker push commonworkflowlanguage/cwltool
 fi
 #docker rm -v $(docker ps -a -f status=exited | sed 's/  */ /g' | cut -d' ' -f1)
-return ${CODE}
+exit ${CODE}