Merge pull request #42 from joshmoore/dropbox

Re-activate dropbox test
ome · Jan 15, 2020 · 874f644 · 874f644
2 parents 8da8e34 + 871e819
commit 874f644
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,10 +9,10 @@ WORKDIR /opt/setup
 ADD playbook.yml requirements.yml /opt/setup/
 
 RUN yum -y install epel-release \
-    && yum -y install ansible sudo git \
+    && yum -y install ansible sudo \
     && ansible-galaxy install -p /opt/setup/roles -r requirements.yml
 
-ARG OMERO_VERSION=5.6.0-rc1
+ARG OMERO_VERSION=5.6.0
 ARG OMEGO_ADDITIONAL_ARGS=
 ENV OMERODIR=/opt/omero/server/OMERO.server/
 RUN ansible-playbook playbook.yml \

diff --git a/playbook.yml b/playbook.yml
@@ -9,3 +9,4 @@
     omero_server_virtualenv: True
     omero_server_python3: True
     omero_server_python3_replace_omero: False
+    postgresql_version: "11"
diff --git a/requirements.yml b/requirements.yml
@@ -13,8 +13,7 @@
   version: 0.3.2
 
 - name: ome.omero_server
-  src: https://github.com/ome/ansible-role-omero-server/archive/6617b30a270dc1ca53d8ce1818fb8cbf1857ad3a.tar.gz
-  version: 6617b30a270dc1ca53d8ce1818fb8cbf1857ad3a
+  version: 3.0.0
 
-- src: ome.postgresql
-  version: 3.3.1
+- name: ome.postgresql
+  version: 4.0.0
diff --git a/test.sh b/test.sh
@@ -42,8 +42,7 @@ bash test_login.sh
 sleep 60
 # Now that we know the server is up, test Dropbox
 
-## FIXME: disabling until 5.6.dev1 is included
-## bash test_dropbox.sh
+bash test_dropbox.sh
 
 # And Processor (slave-1)
 bash test_processor.sh