Merge pull request #57 from manics/omero-web-update

OMERO.web 5.29.3-1

Author: manics

ci/test.sh

@@ -36,6 +36,7 @@ display_logs() {
 
 set -eux
 
+fold_start "installing postgresql omero-server omero-web"
 IP=$(hostname -I | awk '{print $1}')
 
 TEST_NAMESPACE=omero-test
@@ -49,6 +50,7 @@ helm upgrade --install omero-server --namespace $TEST_NAMESPACE --create-namespa
 helm dependency update ./omero-web/
 helm upgrade --install omero-web --namespace $TEST_NAMESPACE --create-namespace \
     ./omero-web/ -f test-omero-web.yaml
+fold_end
 
 fold_start "waiting for omero-server"
 n=0
@@ -90,15 +92,21 @@ until [ "`kubectl_retry -n $TEST_NAMESPACE get deploy omero-web -o jsonpath='{.s
 done
 fold_end
 
-echo "Importing image"
+# Display logs if tests fail
+trap display_logs EXIT
+
+fold_start "importing image"
 OMERO_PORT=$(kubectl -n $TEST_NAMESPACE get svc omero-server -o jsonpath='{.spec.ports[0].nodePort}')
 omero login -s root@localhost:$OMERO_PORT -w omero
 omero import -T Dataset:name:test ci/opengraph-repo-image.jpg
 omero logout
 omero login -s wss://localhost/omero-ws -u root -w omero
 omero import -T Dataset:name:testws ci/opengraph-repo-image.jpg
 omero logout
+fold_end
 
+fold_start "pytest"
 SERVER="https://localhost" pytest ci/test_image.py
+fold_end
 
 display_logs

omero-web/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: 5.29.2
+appVersion: 5.29.3-1
 description: OMERO.web
 name: omero-web
-version: 0.4.10
+version: 0.4.11
 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg

omero-web/values.yaml

@@ -67,6 +67,9 @@ affinity: {}
 
 redis:
   enabled: true
+  image:
+    # Temporary workaround for https://github.com/manics/kubernetes-omero/issues/55
+    repository: bitnamilegacy/redis
   architecture: standalone
   # TODO: Use the autogenerated redis secret instead
   auth:

test-postgresql.yaml

@@ -1,6 +1,9 @@
 # See https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters
 # image:
 #   tag: 15.0.0-debian-11-r1
+image:
+  # Temporary workaround for https://github.com/manics/kubernetes-omero/issues/55
+  repository: bitnamilegacy/postgresql
 
 # TODO: Use the autogenerated postgres secret instead