- Travis-selenium tentative fix

GeoNode · Jun 20, 2019 · 70838d1 · 70838d1
1 parent d985847
commit 70838d1
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 123 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,125 +38,125 @@ matrix:
             TEST_RUN_CORE: 'True'
             MONITORING_ENABLED: 'False'
             SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-    - name: "GeoServer-backend Contrib Apps Smoke Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.geoserver'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            ON_TRAVIS: 'True'
-            TEST_RUN_INTERNAL_APPS: 'True'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-    - name: "GeoServer-backend Integration Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.geoserver'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            # This is GeoServer server address
-            GEOSERVER_SERVER_URL: http://localhost:8080/geoserver/
-            GEOSERVER_SERVER_PORT: 8080
-            ON_TRAVIS: 'True'
-            TEST_RUN_INTEGRATION: 'True'
-            TEST_RUN_INTEGRATION_CSW: 'False'
-            TEST_RUN_INTEGRATION_BDD: 'False'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-            CELERY_ALWAYS_EAGER: 'True'
-    - name: "GeoServer-backend Integration CSW Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.geoserver'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            # This is GeoServer server address
-            GEOSERVER_SERVER_URL: http://localhost:8080/geoserver/
-            GEOSERVER_SERVER_PORT: 8080
-            ON_TRAVIS: 'True'
-            TEST_RUN_INTEGRATION: 'False'
-            TEST_RUN_INTEGRATION_CSW: 'True'
-            TEST_RUN_INTEGRATION_BDD: 'False'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-            CELERY_ALWAYS_EAGER: 'True'
-    - name: "GeoServer-backend Integration BDD Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.geoserver'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            # This is GeoServer server address
-            GEOSERVER_SERVER_URL: http://localhost:8080/geoserver/
-            GEOSERVER_SERVER_PORT: 8080
-            ON_TRAVIS: 'True'
-            TEST_RUN_INTEGRATION: 'False'
-            TEST_RUN_INTEGRATION_CSW: 'False'
-            TEST_RUN_INTEGRATION_BDD: 'True'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-            CELERY_ALWAYS_EAGER: 'True'
-    - name: "QGis Server-backend Core Modules Smoke Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.qgis_server'
-            DJANGO_SETTINGS_MODULE: 'geonode.local_settings'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            # This is qgis server address
-            QGIS_SERVER_URL: http://localhost:9000/
-            # This is the location of docker network bridge
-            # So QGIS server can access this address
-            SITEURL: http://localhost:8000/
-            QGIS_SERVER_PORT: 9000
-            ON_TRAVIS: 'True'
-            TEST_RUN_CORE: 'True'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-            CELERY_ALWAYS_EAGER: 'True'
-    - name: "QGis Server-backend Contrib Apps Smoke Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.qgis_server'
-            DJANGO_SETTINGS_MODULE: 'geonode.local_settings'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            # This is qgis server address
-            QGIS_SERVER_URL: http://localhost:9000/
-            # This is the location of docker network bridge
-            # So QGIS server can access this address
-            SITEURL: http://localhost:8000/
-            QGIS_SERVER_PORT: 9000
-            ON_TRAVIS: 'True'
-            TEST_RUN_INTERNAL_APPS: 'True'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-            CELERY_ALWAYS_EAGER: 'True'
-    - name: "QGis Server-backend Integration Tests"
-      python: 2.7
-      virtualenv:
-          system_site_packages: true
-      env:
-          - BACKEND: 'geonode.qgis_server'
-            DJANGO_SETTINGS_MODULE: 'geonode.local_settings'
-            DOCKER_COMPOSE_VERSION: 1.19.0
-            # This is qgis server address
-            QGIS_SERVER_URL: http://localhost:9000/
-            # This is the location of docker network bridge
-            # So QGIS server can access this address
-            SITEURL: http://localhost:8000/
-            QGIS_SERVER_PORT: 9000
-            ON_TRAVIS: 'True'
-            TEST_RUN_INTEGRATION: 'True'
-            MONITORING_ENABLED: 'False'
-            SESSION_EXPIRED_CONTROL_ENABLED: 'True'
-            CELERY_ALWAYS_EAGER: 'True'
+    # - name: "GeoServer-backend Contrib Apps Smoke Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.geoserver'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_INTERNAL_APPS: 'True'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    # - name: "GeoServer-backend Integration Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.geoserver'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         # This is GeoServer server address
+    #         GEOSERVER_SERVER_URL: http://localhost:8080/geoserver/
+    #         GEOSERVER_SERVER_PORT: 8080
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_INTEGRATION: 'True'
+    #         TEST_RUN_INTEGRATION_CSW: 'False'
+    #         TEST_RUN_INTEGRATION_BDD: 'False'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    #         CELERY_ALWAYS_EAGER: 'True'
+    # - name: "GeoServer-backend Integration CSW Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.geoserver'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         # This is GeoServer server address
+    #         GEOSERVER_SERVER_URL: http://localhost:8080/geoserver/
+    #         GEOSERVER_SERVER_PORT: 8080
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_INTEGRATION: 'False'
+    #         TEST_RUN_INTEGRATION_CSW: 'True'
+    #         TEST_RUN_INTEGRATION_BDD: 'False'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    #         CELERY_ALWAYS_EAGER: 'True'
+    # - name: "GeoServer-backend Integration BDD Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.geoserver'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         # This is GeoServer server address
+    #         GEOSERVER_SERVER_URL: http://localhost:8080/geoserver/
+    #         GEOSERVER_SERVER_PORT: 8080
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_INTEGRATION: 'False'
+    #         TEST_RUN_INTEGRATION_CSW: 'False'
+    #         TEST_RUN_INTEGRATION_BDD: 'True'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    #         CELERY_ALWAYS_EAGER: 'True'
+    # - name: "QGis Server-backend Core Modules Smoke Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.qgis_server'
+    #         DJANGO_SETTINGS_MODULE: 'geonode.local_settings'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         # This is qgis server address
+    #         QGIS_SERVER_URL: http://localhost:9000/
+    #         # This is the location of docker network bridge
+    #         # So QGIS server can access this address
+    #         SITEURL: http://localhost:8000/
+    #         QGIS_SERVER_PORT: 9000
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_CORE: 'True'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    #         CELERY_ALWAYS_EAGER: 'True'
+    # - name: "QGis Server-backend Contrib Apps Smoke Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.qgis_server'
+    #         DJANGO_SETTINGS_MODULE: 'geonode.local_settings'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         # This is qgis server address
+    #         QGIS_SERVER_URL: http://localhost:9000/
+    #         # This is the location of docker network bridge
+    #         # So QGIS server can access this address
+    #         SITEURL: http://localhost:8000/
+    #         QGIS_SERVER_PORT: 9000
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_INTERNAL_APPS: 'True'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    #         CELERY_ALWAYS_EAGER: 'True'
+    # - name: "QGis Server-backend Integration Tests"
+    #   python: 2.7
+    #   virtualenv:
+    #       system_site_packages: true
+    #   env:
+    #       - BACKEND: 'geonode.qgis_server'
+    #         DJANGO_SETTINGS_MODULE: 'geonode.local_settings'
+    #         DOCKER_COMPOSE_VERSION: 1.19.0
+    #         # This is qgis server address
+    #         QGIS_SERVER_URL: http://localhost:9000/
+    #         # This is the location of docker network bridge
+    #         # So QGIS server can access this address
+    #         SITEURL: http://localhost:8000/
+    #         QGIS_SERVER_PORT: 9000
+    #         ON_TRAVIS: 'True'
+    #         TEST_RUN_INTEGRATION: 'True'
+    #         MONITORING_ENABLED: 'False'
+    #         SESSION_EXPIRED_CONTROL_ENABLED: 'True'
+    #         CELERY_ALWAYS_EAGER: 'True'
     - name: "Selenium Integration Tests"
       python: 3.5
       env:

diff --git a/requirements.txt b/requirements.txt
@@ -64,7 +64,7 @@ django-basic-authentication-decorator==0.9
 
 # GeoNode org maintained apps.
 django-geoexplorer==4.0.43
-django-mapstore-adapter==1.0.3
+django-mapstore-adapter==1.0.2
 django-geonode-mapstore-client==1.3.1
 geonode-user-messages==0.1.14
 geonode-avatar==2.1.8

diff --git a/scripts/spcgeonode/docker-compose.yml b/scripts/spcgeonode/docker-compose.yml
@@ -34,8 +34,6 @@ x-common-django:
     - GEOSERVER_LOCATION=http://nginx/geoserver/
     - ASYNC_SIGNALS=True
     - SESSION_EXPIRED_CONTROL_ENABLED=False
-    - DEFAULT_BACKEND_UPLOADER=geonode.rest
-    - TIME_ENABLED=False
     # TODO : we should probably remove this and set Celery to use JSON serialization instead of pickle
     - C_FORCE_ROOT=True
     # We get an exception after migrations on startup (it seems the monitoring app tries to resolve the geoserver domain name after it's migration, which can happen before oauth migrations on which geoserver startup depends...)
@@ -57,7 +55,7 @@ services:
       retries: 1
       start_period: 60s
     entrypoint: ["/spcgeonode/scripts/spcgeonode/django/docker-entrypoint.sh"]
-    command: "uwsgi --chdir=/spcgeonode --module=geonode.wsgi --socket=:8000 --http=127.0.0.1:8001 --processes=4 --threads=2 --buffer-size=32768 --max-requests=500"
+    command: "uwsgi --chdir=/spcgeonode --module=geonode.wsgi --socket=:8000 --http=127.0.0.1:8001 --processes=5 --buffer-size=32768 --max-requests=500"
 
   # Celery worker that executes celery tasks created by Django.
   celery: