From bea42d23f8889335c1d75675de39bcb7f6d29d93 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 10 Jul 2018 08:49:16 +0200 Subject: [PATCH 1/2] Expand OMERO-test-integration configuration to set up fake mail This allows the mail integration tests to be executed rather than skipped --- home/jobs/OMERO-test-integration/config.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml index 41eeeff3..dbdb22f6 100644 --- a/home/jobs/OMERO-test-integration/config.xml +++ b/home/jobs/OMERO-test-integration/config.xml @@ -98,9 +98,18 @@ rm dbsetup.sql ## END PURGE -# install web dependencies +# Install web dependencies pip install -r $OMERO_DIST/share/web/requirements-py27-nginx.txt +# Set up fake mail configuration +export OMERO_PROFILE=$WORKSPACE/config +mkdir -p $OMERO_PROFILE/blitz +cp $OMERO_DIST/etc/blitz/* $OMERO_PROFILE/blitz +for f in $OMERO_PROFILE/blitz/*; do mv $f $OMERO_PROFILE/blitz/`basename $f .ex +$OMERO_DIST/bin/omero config set omero.mail.config true +$OMERO_DIST/bin/omero config set omero.mail.fake true +$OMERO_DIST/bin/omero config set omero.mail.port 2525 + # START OMERO BUILD_ID=DONT_KILL_ME $OMERO_DIST/bin/omero admin start $OMERO_DIST/bin/omero admin waitup From 594f2cacbbdd46168677c0321ea51c3e2edc70dd Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Sat, 4 Aug 2018 07:56:29 +0100 Subject: [PATCH 2/2] Fix incomplete configuration line --- home/jobs/OMERO-test-integration/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/jobs/OMERO-test-integration/config.xml b/home/jobs/OMERO-test-integration/config.xml index dbdb22f6..7530a9d3 100644 --- a/home/jobs/OMERO-test-integration/config.xml +++ b/home/jobs/OMERO-test-integration/config.xml @@ -105,7 +105,7 @@ pip install -r $OMERO_DIST/share/web/requirements-py27-nginx.txt export OMERO_PROFILE=$WORKSPACE/config mkdir -p $OMERO_PROFILE/blitz cp $OMERO_DIST/etc/blitz/* $OMERO_PROFILE/blitz -for f in $OMERO_PROFILE/blitz/*; do mv $f $OMERO_PROFILE/blitz/`basename $f .ex +for f in $OMERO_PROFILE/blitz/*; do mv $f $OMERO_PROFILE/blitz/`basename $f .example`.xml; done $OMERO_DIST/bin/omero config set omero.mail.config true $OMERO_DIST/bin/omero config set omero.mail.fake true $OMERO_DIST/bin/omero config set omero.mail.port 2525