From 2fa6fb162e355f087c3c0fbaa400df5f882a9862 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 11:30:57 +0100 Subject: [PATCH 1/7] increasing delay --- tests/casperjs/control-panel-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/casperjs/control-panel-tests.js b/tests/casperjs/control-panel-tests.js index 6cfd79761..e3003666a 100755 --- a/tests/casperjs/control-panel-tests.js +++ b/tests/casperjs/control-panel-tests.js @@ -30,7 +30,7 @@ casper.test.begin('VFB control panel tests', 7, function suite(test) { this.echo("I waited for the logo to load."); test.assertTitle("geppetto's home", "geppetto's homepage title is the one expected"); test.assertExists('div#logo', "logo is found"); - }, null, 10000); + }, null, 120000); }); // open project, check for items in control panel + instances From d8a4e34b86479c40ed6bc234dce199c0767a434d Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 16:21:56 +0100 Subject: [PATCH 2/7] remote solr for local instance --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 49417d78b..f6b336565 100755 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,10 @@ script: - sed -i 's|"useSsl":.*,|"useSsl":false,|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json - sed -i 's|"embedded":.*,|"embedded":false,|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json - sed -i 's|"embedderURL":.*,|"embedderURL":"/",|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json +- | + if [ "$VFBSUB" = "local" ]; then + sed -i 's|/solr/ontology/select|http://solr.virtualflybrain.org/solr/ontology/select|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json + fi - echo -e "travis_fold:end:Geppetto-Config" - echo -e "travis_fold:start:Docker-Build" - docker build -t $REPO:$COMMIT . From 9620df79318afc3d8d2e9d2316b30c029342f973 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 16:44:38 +0100 Subject: [PATCH 3/7] location fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6b336565..3604a3438 100755 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: - sed -i 's|"embedderURL":.*,|"embedderURL":"/",|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json - | if [ "$VFBSUB" = "local" ]; then - sed -i 's|/solr/ontology/select|http://solr.virtualflybrain.org/solr/ontology/select|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json + sed -i 's|/solr/ontology/select|http://solr.virtualflybrain.org/solr/ontology/select|g' $TRAVIS_BUILD_DIR/ComponentsInitialization.js fi - echo -e "travis_fold:end:Geppetto-Config" - echo -e "travis_fold:start:Docker-Build" From 4e1954aa96ac4df6da076a07a533976e8f0e2b9a Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 17:18:07 +0100 Subject: [PATCH 4/7] adding solr server env --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1c00df08d..a8fa517d0 100755 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,8 @@ ENV PATH=/opt/apache-maven-3.3.9/bin/:$PATH # Forcing bash: RUN rm /bin/sh && ln -s /bin/bash /bin/sh && rm /bin/sh.distrib && ln -s /bin/bash /bin/sh.distrib +#SOLR server: +ENV SOLR_SERVER=/solr/ontology/select USER virgo # Geppetto: @@ -45,6 +47,7 @@ git clone https://github.com/openworm/org.geppetto.datasources.git -b $BRANCH_OR git clone https://github.com/openworm/org.geppetto.model.swc.git -b $BRANCH_ORG_GEPPETTO_MODEL_SWC && \ git clone https://github.com/openworm/org.geppetto.simulation.git -b $BRANCH_ORG_GEPPETTO_SIMULATION && \ git clone https://github.com/VirtualFlyBrain/uk.ac.vfb.geppetto.git -b $BRANCH_UK_AC_VFB_GEPPETTO && \ +sed -i "s|\"/solr/ontology/select|\"${SOLR_SERVER}|g" geppetto-vfb/ComponentsInitialization.js mv geppetto-vfb org.geppetto.frontend/src/main/webapp/extensions/ #Set GA keys TBD:Check if still needed From 41365e7b13c13c9f9f8ea1438e335802a18954ac Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 17:19:23 +0100 Subject: [PATCH 5/7] replace in dockerfile --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3604a3438..84920f11f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: - sed -i 's|"embedderURL":.*,|"embedderURL":"/",|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json - | if [ "$VFBSUB" = "local" ]; then - sed -i 's|/solr/ontology/select|http://solr.virtualflybrain.org/solr/ontology/select|g' $TRAVIS_BUILD_DIR/ComponentsInitialization.js + sed -i 's|SOLR_SERVER=/solr/ontology/select|SOLR_SERVER=http://solr.virtualflybrain.org/solr/ontology/select|g' $TRAVIS_BUILD_DIR/Dockerfile fi - echo -e "travis_fold:end:Geppetto-Config" - echo -e "travis_fold:start:Docker-Build" From 25bb1e8446aa2773fcb159cab3b02add3f34bd98 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 17:24:56 +0100 Subject: [PATCH 6/7] typo fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8fa517d0..dd5f77bfb 100755 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ git clone https://github.com/openworm/org.geppetto.datasources.git -b $BRANCH_OR git clone https://github.com/openworm/org.geppetto.model.swc.git -b $BRANCH_ORG_GEPPETTO_MODEL_SWC && \ git clone https://github.com/openworm/org.geppetto.simulation.git -b $BRANCH_ORG_GEPPETTO_SIMULATION && \ git clone https://github.com/VirtualFlyBrain/uk.ac.vfb.geppetto.git -b $BRANCH_UK_AC_VFB_GEPPETTO && \ -sed -i "s|\"/solr/ontology/select|\"${SOLR_SERVER}|g" geppetto-vfb/ComponentsInitialization.js +sed -i "s|\"/solr/ontology/select|\"${SOLR_SERVER}|g" geppetto-vfb/ComponentsInitialization.js && \ mv geppetto-vfb org.geppetto.frontend/src/main/webapp/extensions/ #Set GA keys TBD:Check if still needed From 17140094df1dad8adc9ffca7c2cc78abfd41b9ea Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 22 May 2018 17:55:45 +0100 Subject: [PATCH 7/7] increasing timeout --- tests/casperjs/query-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/casperjs/query-tests.js b/tests/casperjs/query-tests.js index 7c56a3226..5ac982f7e 100755 --- a/tests/casperjs/query-tests.js +++ b/tests/casperjs/query-tests.js @@ -88,7 +88,7 @@ casper.test.begin('VFB query component tests', function suite(test) { runQueryTests(); }, null, 10000); }, null, 10000); - }, null, 10000); + }, null, 120000); }); };