Skip to content

Commit

Permalink
Merge pull request #195 from sbesson/integration_certificates
Browse files Browse the repository at this point in the history
OMERO-test-integration: install self-signed certificates
  • Loading branch information
jburel authored Oct 8, 2022
2 parents f3faac7 + a108090 commit 42bab07
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions home/jobs/OMERO-test-integration/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ source $WORKSPACE/.venv3/bin/activate
for x in *.tar.gz; do
pip install -U $x
done
pip install omero-certificates

# Cause CLI plugin tests to be run against the relevant version.
for x in omero-cli-duplicate; do
Expand All @@ -119,6 +120,7 @@ omero config set omero.jvmcfg.max_system_memory.blitz 64000
omero config set omero.data.dir $OMERO_DATA_DIR
omero config set omero.ports.prefix 1
omero config set omero.web.server_list '[["testintegration",14064,"testintegration"]]'
omero certificates

## END LOAD CONFIG

Expand Down
2 changes: 1 addition & 1 deletion slave/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ADD ./run.sh /tmp/run.sh
RUN chown omero:omero /tmp/run.sh
RUN chmod a+x /tmp/run.sh

RUN yum install -y python36
RUN yum install -y python36 openssl
RUN python3 -m venv /py3 && /py3/bin/pip install -U pip tox future wheel restructuredtext-lint
RUN /py3/bin/pip install https://github.com/ome/zeroc-ice-py-centos7/releases/download/0.2.1/zeroc_ice-3.6.5-cp36-cp36m-linux_x86_64.whl
RUN ln -s /py3/bin/slice2py /usr/bin/slice2py
Expand Down

0 comments on commit 42bab07

Please sign in to comment.