From a572ef644ee17b0a61e039ce691a39554031aa73 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 27 May 2015 14:18:23 -0400 Subject: [PATCH] 5548: Remove git commands from run-cwl-tests. Remove cwltool from build-packages. --- jenkins/run-build-packages.sh | 31 ------------------------------- jenkins/run-cwl-tests.sh | 17 ----------------- 2 files changed, 48 deletions(-) diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh index bb0877e..691e93b 100755 --- a/jenkins/run-build-packages.sh +++ b/jenkins/run-build-packages.sh @@ -489,37 +489,6 @@ for deppkg in docker-py six requests; do build_and_scp_deb "$deppkg" "python3-$deppkg" "" python3 done -# cwltool from common-workflow-language. We use this in arv-run-pipeline-instance. -# We use $WORKSPACE/common-workflow-language as the clean directory from which to build the cwltool package -if [[ ! -d "$WORKSPACE/common-workflow-language" ]]; then - mkdir "$WORKSPACE/common-workflow-language" - cd "$WORKSPACE" - if [[ "$DEBUG" != 0 ]]; then - git clone https://github.com/common-workflow-language/common-workflow-language.git common-workflow-language - else - git clone -q https://github.com/common-workflow-language/common-workflow-language.git common-workflow-language - fi -fi - -cd "$WORKSPACE/common-workflow-language" -if [[ "$DEBUG" != 0 ]]; then - git checkout master - git pull -else - git checkout -q master - git pull -q -fi - -cd reference -handle_python_package -CWLTOOL_VERSION=`git log --first-parent --max-count=1 --format='format:0.1.%ct.%h'` - -# Build cwltool package -cd $WORKSPACE/debs -# Python version numbering is obscure. Strip dashes and replace them with dots -# to match our other version numbers. Cf. commit 4afcb8c, compliance with PEP-440. -build_and_scp_deb $WORKSPACE/common-workflow-language/reference cwltool 'Common Workflow Language Working Group' 'python' "$(awk '($1 == "Version:"){ gsub(/-/,".",$2); print $2 }' $WORKSPACE/common-workflow-language/reference/cwltool.egg-info/PKG-INFO)" - # Finally, publish the packages, if necessary if [[ "$UPLOAD" != 0 && "$CALL_FREIGHT" != 0 ]]; then ssh -p2222 $APTUSER@$APTSERVER -t "cd tmp && ls -laF *deb && freight add *deb apt/wheezy && freight cache && rm -f *deb" diff --git a/jenkins/run-cwl-tests.sh b/jenkins/run-cwl-tests.sh index 917365d..74e9999 100755 --- a/jenkins/run-cwl-tests.sh +++ b/jenkins/run-cwl-tests.sh @@ -156,23 +156,6 @@ 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 -else - git checkout -q master - git pull -q -fi - pushd reference python setup.py install python setup.py test -- 2.30.2