Skip to content

upload the cwltool-conformance jenkins build script #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions jenkins.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/bash
cloneorpull() {
if test -d $1 ; then
(cd $1 && git pull)
else
git clone $2
fi
}
venv() {
if ! test -d $1 ; then
virtualenv $1
fi
. $1/bin/activate
}
cloneorpull common-workflow-language https://github.com/common-workflow-language/common-workflow-language.git
venv cwltool-venv
(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ pip install -U setuptools wheel pip)
(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ python setup.py install)
(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ pip install "cwltest>=1.0.20160825151655")
# (. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-2)
(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-3)
(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool)
(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=v1.1.0-dev1 EXTRA=--enable-dev)
(. cwltool-venv/bin/activate && ./build-cwl-docker.sh && docker push commonworkflowlanguage/cwltool_module && docker push commonworkflowlanguage/cwltool)
2 changes: 1 addition & 1 deletion tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class TestFactory(unittest.TestCase):
def test_factory(self):
f = cwltool.factory.Factory()
echo = f.make(get_data("tests/echo.cwl"))
self.assertEqual(echo(inp="foo"), {"out": "foo\n"})
self.assertEqual(echo(inp="foo"), {"out": b"foo\n"})

def test_partial_scatter(self):
f = cwltool.factory.Factory(on_error="continue")
Expand Down
18 changes: 9 additions & 9 deletions tests/test_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ def check_exists(self, url): # type: (unicode) -> bool
else:
return False

def urljoin(self, base, url):
urlsp = urllib.parse.urlsplit(url)
if urlsp.scheme:
return url
basesp = urllib.parse.urlsplit(base)

if basesp.scheme == "keep":
return base + "/" + url
return urllib.parse.urljoin(base, url)
def urljoin(self, base, url):
urlsp = urllib.parse.urlsplit(url)
if urlsp.scheme:
return url
basesp = urllib.parse.urlsplit(base)

if basesp.scheme == "keep":
return base + "/" + url
return urllib.parse.urljoin(base, url)

def test_resolver(d, a):
return "baz:bar/" + a
Expand Down