Skip to content

Commit 4c2667e

Browse files
authored
hack for running conformance tests for v1.1 (#1049)
1 parent 4d4bbc3 commit 4c2667e

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

jenkins.bash

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ venv() {
1616
# clean both the repos before the loop
1717
git clean --force -d -x || /bin/true
1818
wget https://github.com/common-workflow-language/common-workflow-language/archive/master.tar.gz
19-
tar xzf master.tar.gz
19+
tar xzf master.tar.gz && rm master.tar.gz
2020
docker pull node:slim
21-
21+
wget https://github.com/common-workflow-language/cwl-v1.1/archive/master.tar.gz
22+
tar xzf master.tar.gz && rm master.tar.gz
2223

2324
# Test for Python 2.7 and Python 3
2425
for PYTHON_VERSION in 2 3
@@ -34,7 +35,13 @@ do
3435
pip${PYTHON_VERSION} uninstall -y cwltool
3536
pip${PYTHON_VERSION} install -e .
3637
pip${PYTHON_VERSION} install "cwltest>=1.0.20180518074130" codecov
37-
pushd common-workflow-language-master
38+
if [[ "$version" = "v1.0" ]]
39+
then
40+
DRAFT="DRAFT=v1.0"
41+
pushd common-workflow-language-master
42+
else
43+
pushd cwl-v1.1-master
44+
fi
3845
rm -f .coverage* coverage.xml
3946
source=$(realpath ../cwltool)
4047
COVERAGE_RC=${PWD}/.coveragerc
@@ -77,7 +84,7 @@ EOF
7784
# shellcheck disable=SC2086
7885
LC_ALL=C.UTF-8 ./run_test.sh --junit-xml=result${PYTHON_VERSION}.xml \
7986
RUNNER=${CWLTOOL_WITH_COV} "-j$(($(nproc) / 2))"\
80-
DRAFT="${version}" "${EXTRA}" \
87+
${DRAFT} "${EXTRA}" \
8188
"--classname=py${PYTHON_VERSION}_${CONTAINER}"
8289
# LC_ALL=C is to work around junit-xml ASCII only bug
8390
CODE=$((CODE+$?)) # capture return code of ./run_test.sh

0 commit comments

Comments
 (0)