Work-around Java SSL bug

See ome/openmicroscopy#5949
ome · May 8, 2019 · a5805c2 · a5805c2
1 parent 32a2e31
commit a5805c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/test_import.sh b/test_import.sh
@@ -12,7 +12,9 @@ FILENAME=$(date +%Y%m%d-%H%M%S-%N).fake
 docker exec $PREFIX-server sh -c \
     "mkdir -p /OMERO/inplace-data && touch /OMERO/inplace-data/$FILENAME"
 
-image=$(docker exec $PREFIX-server $OMERO import -q -s localhost -u $OMERO_USER -w $OMERO_PASS --transfer=ln_s -T Dataset:name:test /OMERO/inplace-data/$FILENAME)
+# Fixed in 5.5.0 https://github.com/openmicroscopy/openmicroscopy/pull/5949
+BUGFIX_ARGS="--skip upgrade"
+image=$(docker exec $PREFIX-server $OMERO import -q -s localhost -u $OMERO_USER -w $OMERO_PASS $BUGFIX_ARGS --transfer=ln_s -T Dataset:name:test /OMERO/inplace-data/$FILENAME)
 
 echo "Checking imported in-place image $FILENAME "
 OMRPATH=$(docker exec $PREFIX-server $OMERO hql -q "SELECT concat('/OMERO/ManagedRepository/', i.fileset.templatePrefix, i.name) FROM Image i WHERE i.id=${image#*:}" --style csv | cut -d, -f2- | tail -n1)

diff --git a/test_processor.sh b/test_processor.sh
@@ -14,8 +14,10 @@ SCRIPT=/omero/util_scripts/Dataset_To_Plate.py
 
 dataset_id=$(docker exec $PREFIX-server $OMERO obj -q -s localhost -u $OMERO_USER -w $OMERO_PASS new Dataset name=$DSNAME | cut -d: -f2)
 
+# Fixed in 5.5.0 https://github.com/openmicroscopy/openmicroscopy/pull/5949
+BUGFIX_ARGS="--skip upgrade"
 docker exec $PREFIX-server sh -c \
-    "touch /tmp/$FILENAME && $OMERO import -d $dataset_id /tmp/$FILENAME"
+    "touch /tmp/$FILENAME && $OMERO import $BUGFIX_ARGS -d $dataset_id /tmp/$FILENAME"
 
 docker exec $PREFIX-server $OMERO script launch $SCRIPT IDs=$dataset_id
 echo "Completed with code $?"