projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14886: Fixes mock issue between tests
[arvados.git]
/
sdk
/
cwl
/
test_with_arvbox.sh
diff --git
a/sdk/cwl/test_with_arvbox.sh
b/sdk/cwl/test_with_arvbox.sh
index 88860c04eb0a390f7abb8477e6f351fdb06fe402..37eb5171ebbc55779f86e0e275e4eb8d7a490cd6 100755
(executable)
--- a/
sdk/cwl/test_with_arvbox.sh
+++ b/
sdk/cwl/test_with_arvbox.sh
@@
-13,6
+13,9
@@
reset_container=1
leave_running=0
config=dev
tag="latest"
leave_running=0
config=dev
tag="latest"
+pythoncmd=python
+suite=conformance
+runapi=containers
while test -n "$1" ; do
arg="$1"
while test -n "$1" ; do
arg="$1"
@@
-33,8
+36,24
@@
while test -n "$1" ; do
tag=$2
shift ; shift
;;
tag=$2
shift ; shift
;;
+ --build)
+ build=1
+ shift
+ ;;
+ --pythoncmd)
+ pythoncmd=$2
+ shift ; shift
+ ;;
+ --suite)
+ suite=$2
+ shift ; shift
+ ;;
+ --api)
+ runapi=$2
+ shift ; shift
+ ;;
-h|--help)
-h|--help)
- echo "$0 [--no-reset-container] [--leave-running] [--config dev|localdemo] [--tag docker_tag]"
+ echo "$0 [--no-reset-container] [--leave-running] [--config dev|localdemo] [--tag docker_tag]
[--build] [--pythoncmd python(2|3)] [--suite (integration|conformance)]
"
exit
;;
*)
exit
;;
*)
@@
-48,6
+67,8
@@
if test -z "$ARVBOX_CONTAINER" ; then
fi
if test $reset_container = 1 ; then
fi
if test $reset_container = 1 ; then
+ arvbox stop
+ docker rm $ARVBOX_CONTAINER
arvbox reset -f
fi
arvbox reset -f
fi
@@
-58,13
+79,21
@@
set -eu -o pipefail
. /usr/local/lib/arvbox/common.sh
. /usr/local/lib/arvbox/common.sh
+export PYCMD=$pythoncmd
+
if test $config = dev ; then
cd /usr/src/arvados/sdk/cwl
if test $config = dev ; then
cd /usr/src/arvados/sdk/cwl
-
python
setup.py sdist
+
\$PYCMD
setup.py sdist
pip_install \$(ls -r dist/arvados-cwl-runner-*.tar.gz | head -n1)
fi
pip_install \$(ls -r dist/arvados-cwl-runner-*.tar.gz | head -n1)
fi
-pip install cwltest
+set -x
+
+if [ \$PYCMD = "python3" ]; then
+ pip3 install cwltest
+else
+ pip install cwltest
+fi
mkdir -p /tmp/cwltest
cd /tmp/cwltest
mkdir -p /tmp/cwltest
cd /tmp/cwltest
@@
-78,12
+107,14
@@
export ARVADOS_API_HOST_INSECURE=1
export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados/superuser_token)
export ARVADOS_API_TOKEN=\$(cat /var/lib/arvados/superuser_token)
-if test "$tag" = "latest" ; then
+if test -n "$build" ; then
+ /usr/src/arvados/build/build-dev-docker-jobs-image.sh
+elif test "$tag" = "latest" ; then
arv-keepdocker --pull arvados/jobs $tag
else
arv-keepdocker --pull arvados/jobs $tag
else
- jobsimg=
$(curl http
://versions.arvados.org/v1/commit/$tag | python -c "import json; import sys; sys.stdout.write(json.load(sys.stdin)['Versions']['Docker']['arvados/jobs'])")
- arv-keepdocker --pull arvados/jobs $jobsimg
- docker tag
-f arvados/jobs:
$jobsimg arvados/jobs:latest
+ jobsimg=
\$(curl https
://versions.arvados.org/v1/commit/$tag | python -c "import json; import sys; sys.stdout.write(json.load(sys.stdin)['Versions']['Docker']['arvados/jobs'])")
+ arv-keepdocker --pull arvados/jobs
\
$jobsimg
+ docker tag
arvados/jobs:\
$jobsimg arvados/jobs:latest
arv-keepdocker arvados/jobs latest
fi
arv-keepdocker arvados/jobs latest
fi
@@
-100,7
+131,12
@@
EOF2
chmod +x /tmp/cwltest/arv-cwl-containers
env
chmod +x /tmp/cwltest/arv-cwl-containers
env
-exec ./run_test.sh EXTRA=--compute-checksum $@
+if [[ "$suite" = "conformance" ]] ; then
+ exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-${runapi} EXTRA=--compute-checksum $@
+elif [[ "$suite" = "integration" ]] ; then
+ cd /usr/src/arvados/sdk/cwl/tests
+ exec ./arvados-tests.sh $@
+fi
EOF
CODE=$?
EOF
CODE=$?