Merge branch '21659-gh-workflow-tests' into main. Closes #21659

[arvados.git] / sdk / python / tests / fed-migrate / jenkins.sh

diff --git a/sdk/python/tests/fed-migrate/jenkins.sh b/sdk/python/tests/fed-migrate/jenkins.sh
index e5dd8aa913892db7c7413d1820cc659e5d38c7fd..46981e5016a31892739f7d03ae1ac0ba16490536 100755 (executable)
--- a/sdk/python/tests/fed-migrate/jenkins.sh
+++ b/sdk/python/tests/fed-migrate/jenkins.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
 if test -z "$WORKSPACE" ; then
     echo "WORKSPACE unset"
@@ -11,20 +14,13 @@ docker rm fedbox1-data fedbox2-data fedbox3-data
 
 set -ex
 
-mkdir -p $WORKSPACE/tmp
-cd $WORKSPACE/tmp
-virtualenv --python python3 venv3
-. venv3/bin/activate
-
-cd $WORKSPACE/sdk/python
-pip install -e .
-
-cd $WORKSPACE/sdk/cwl
-pip install -e .
+mkdir -p "$WORKSPACE/tmp/arvbox"
+python3 -m venv "$WORKSPACE/tmp/venv3"
+"$WORKSPACE/tmp/venv3/bin/pip" install -e "$WORKSPACE/sdk/python" "$WORKSPACE/sdk/cwl"
+alias cwltool='"$WORKSPACE/tmp/venv3/bin/cwltool"'
 
 export PATH=$PATH:$WORKSPACE/tools/arvbox/bin
 
-mkdir -p $WORKSPACE/tmp/arvbox
 cd $WORKSPACE/sdk/python/tests/fed-migrate
 cwltool arvbox-make-federation.cwl \
        --arvbox_base $WORKSPACE/tmp/arvbox \