Testing Ubuntu Focal on Travis CI

Author: asherpasha

.travis.yml

@@ -1,26 +1,22 @@
+---
+os: linux
 language: python
-sudo: false
 jdk: openjdk11
-dist: bionic
+dist: focal
 addons:
-  - postgresql: 11
+  - postgresql: 12.2
 services: postgresql
 env:
   global:
     - TESTMODEL_URL=http://localhost:8080/intermine-demo
     - TESTMODEL_PATH=intermine-demo
 before_script:
-  #- export JAVA_HOME=/usr/local/lib/jvm/openjdk8
-  #- export PATH=$JAVA_HOME/bin:$PATH
-  - java -version
-  - javac -version
-  - echo $JAVA_HOME
-  - echo $PATH
   - "./config/travis/init-solr.sh"
   - "./config/travis/init.sh"
 script:
   - python setup.py test
   - python setup.py livetest
 python:
+  - "3.6"
   - "3.7"
 

config/travis/init-solr.sh

@@ -1,7 +1,7 @@
 # set up solr for testmine
 # testmine's setup script populates these empty indexes
 
-wget http://archive.apache.org/dist/lucene/solr/8.5.2/solr-8.5.2.tgz
-tar xzf solr-8.5.2.tgz && ./solr-8.5.2/bin/solr start
-./solr-8.5.2/bin/solr create -c intermine-search
-./solr-8.5.2/bin/solr create -c intermine-autocomplete
+wget http://archive.apache.org/dist/lucene/solr/8.6.2/solr-8.6.2.tgz
+tar xzf solr-8.6.2.tgz && ./solr-8.6.2/bin/solr start
+./solr-8.6.2/bin/solr create -c intermine-search
+./solr-8.6.2/bin/solr create -c intermine-autocomplete

config/travis/init.sh

@@ -10,10 +10,7 @@ else
 fi
 
 # Pull in the server code.
-#git clone --single-branch --depth 1 https://github.com/intermine/intermine.git server
-
-# Testing only for now
-git clone --single-branch --branch remove-gretty-2276 --depth 10 https://github.com/danielabutano/intermine.git server
+git clone --single-branch --depth 1 https://github.com/intermine/intermine.git server
 
 export PSQL_USER=postgres