Skip to content

Commit 8982552

Browse files
committed
Update OMERO.web job
1 parent 43a1eda commit 8982552

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

home/jobs/OMERO-web/config.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,12 @@
2424
<triggers/>
2525
<concurrentBuild>false</concurrentBuild>
2626
<builders>
27-
<hudson.tasks.Shell>
28-
<command>rm -rf $WORKSPACE/.venv3
29-
python3.11 -m venv $WORKSPACE/.venv3
30-
31-
source $WORKSPACE/.venv3/bin/activate
32-
pip install -U pip
33-
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
34-
pip install markdown
35-
pip install omero-py omero-web # Latest in order to stop server. NB: Re-installed from python-superbuild below</command>
36-
</hudson.tasks.Shell>
3727
<hudson.tasks.Shell>
3828
<command>OMERO_DIST=$WORKSPACE/OMERO.web
3929
export OMERODIR=$OMERO_DIST
40-
if [ -e $OMERO_DIST ]; then
41-
source $WORKSPACE/.venv3/bin/activate
30+
OMERO_ENV=$WORKSPACE/.venv3
31+
if [ -e $OMERO_ENV ]; then
32+
source $OMERO_ENV/bin/activate
4233
omero web stop || echo &apos;not running&apos;
4334
sleep 5
4435
echo &quot;Using kill to be extra careful&quot;
@@ -50,7 +41,15 @@ if [ -e $OMERO_DIST ]; then
5041
fi
5142

5243
rm -rf $HOME/static/web/
53-
rm -rf $WORKSPACE/*</command>
44+
rm -rf $WORKSPACE/*
45+
46+
python3.11 -m venv $OMERO_ENV
47+
source $OMERO_ENV/bin/activate
48+
pip install -U pip
49+
pip install https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl
50+
51+
52+
</command>
5453
</hudson.tasks.Shell>
5554
<hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@722.v0662a_9b_e22a_c">
5655
<project>OMERO-build</project>

0 commit comments

Comments
 (0)