21230: Update virtualenv in fed-migrate test 21230-no-global-pip
authorBrett Smith <brett.smith@curii.com>
Tue, 16 Jan 2024 16:14:02 +0000 (11:14 -0500)
committerBrett Smith <brett.smith@curii.com>
Tue, 16 Jan 2024 16:40:04 +0000 (11:40 -0500)
I don't believe this is strictly necessary, but `python3 -m venv` is
more likely to work than `virtualenv` and better matches all our other
code. Everything else is just style updates.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

sdk/python/tests/fed-migrate/jenkins.sh

index 06b5a437e9e860a88a507979833b4fb7506abd83..46981e5016a31892739f7d03ae1ac0ba16490536 100755 (executable)
@@ -14,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 \