Cambios en la versión del explorer y scripts de travis

.travis.yml

@@ -36,32 +36,32 @@ before_script:
 - if ! [ -z $TRAVIS_PULL_REQUEST_BRANCH ] ; then BRANCH_TO_USE=$TRAVIS_PULL_REQUEST_BRANCH && echo "Using PR branch" ; elif ! [ -z $TRAVIS_TAG ] ; then BRANCH_TO_USE=$TRAVIS_TAG && echo "Using tag" ; else BRANCH_TO_USE=$TRAVIS_BRANCH && echo "Using branch" ; fi
 - echo "Building portal with branch or tag $BRANCH_TO_USE"
 - docker build -t datosgobar/portal-andino:$BRANCH_TO_USE .
-#- cd install/
-#- EMAIL=admin@example.com
-#- HOST=localhost
-#- DB_USER=ckan
-#- DB_PASS=ckan
-#- STORE_USER=ckan_store
-#- STORE_PASS=ckan_store
+- cd install/
+- EMAIL=admin@example.com
+- HOST=localhost
+- DB_USER=ckan
+- DB_PASS=ckan
+- STORE_USER=ckan_store
+- STORE_PASS=ckan_store
 
 script:
 - set -e
-#- sudo python ./install.py --error_email "$EMAIL" --site_host="$HOST" --database_user="$DB_USER" --database_password="$DB_PASS" --datastore_user="$STORE_USER" --datastore_password="$STORE_PASS" --andino_version=$BRANCH_TO_USE --branch=$BRANCH_TO_USE
-#- cd -
-#- cd tests/
-#- nosetests tests_portal_with_base_config.py
-#- cd -
-#- cd install/
-#- sudo python ./update.py --andino_version=$BRANCH_TO_USE --branch=$BRANCH_TO_USE --site_host=localhost --ssl_key_path="/tmp/ssl/andino.key" --ssl_crt_path="/tmp/ssl/andino.crt" --nginx_ssl --nginx_ssl_port="7777" --nginx-extended-cache --file_size_limit=1024
-#- cd -
-#- docker ps
-#- docker exec -it andino-nginx bash -c 'ls $NGINX_SSL_CONFIG_DATA'
-#- docker exec -it andino-nginx bash -c 'echo $NGINX_CONFIG_FILE'
-#- while [[ "200" != $(echo $(curl -k -s -o /dev/null -w "%{http_code}" "https://localhost:7777")) ]]; do sleep 10s ; echo $(curl -k -s -o /dev/null -w "%{http_code}" "https://localhost:7777") ; done
-#- cd tests/
-#- sudo nosetests configurations/ globals/
-#- cd -
-#- docker kill $(docker ps -q)
+- sudo python ./install.py --error_email "$EMAIL" --site_host="$HOST" --database_user="$DB_USER" --database_password="$DB_PASS" --datastore_user="$STORE_USER" --datastore_password="$STORE_PASS" --andino_version=$BRANCH_TO_USE --branch=$BRANCH_TO_USE
+- cd -
+- cd tests/
+- nosetests tests_portal_with_base_config.py
+- cd -
+- cd install/
+- sudo python ./update.py --andino_version=$BRANCH_TO_USE --branch=$BRANCH_TO_USE --site_host=localhost --ssl_key_path="/tmp/ssl/andino.key" --ssl_crt_path="/tmp/ssl/andino.crt" --nginx_ssl --nginx_ssl_port="7777" --nginx-extended-cache --file_size_limit=1024
+- cd -
+- docker ps
+- docker exec -it andino-nginx bash -c 'ls $NGINX_SSL_CONFIG_DATA'
+- docker exec -it andino-nginx bash -c 'echo $NGINX_CONFIG_FILE'
+- while [[ "200" != $(echo $(curl -k -s -o /dev/null -w "%{http_code}" "https://localhost:7777")) ]]; do sleep 10s ; echo $(curl -k -s -o /dev/null -w "%{http_code}" "https://localhost:7777") ; done
+- cd tests/
+- sudo nosetests configurations/ globals/
+- cd -
+- docker kill $(docker ps -q)
 - env PORTAL_VERSION="${TRAVIS_TAG:-$TRAVIS_COMMIT}" docker-compose -f dev.yml up -d --build portal
 
 deploy:

Dockerfile

@@ -16,7 +16,7 @@ RUN $CKAN_HOME/bin/pip install -e git+https://github.com/datosgobar/portal-andin
     /etc/ckan_init.d/build-combined-ckan-mo.sh $CKAN_HOME/src/ckanext-gobar-theme/ckanext/gobar_theme/i18n/es/LC_MESSAGES/ckan.po
 
 # Series de Tiempo Ar explorer
-RUN $CKAN_HOME/bin/pip install -e git+https://github.com/datosgobar/ckanext-seriestiempoarexplorer.git@2.5.3#egg=ckanext-seriestiempoarexplorer
+RUN $CKAN_HOME/bin/pip install -e git+https://github.com/datosgobar/ckanext-seriestiempoarexplorer.git@2.8.0#egg=ckanext-seriestiempoarexplorer
 
 # DCAT dependencies (el plugin se instala desde el `requirements.txt` de portal-andino-theme)
 RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckanext-dcat/requirements.txt

scripts/deploy/prepare.sh

@@ -72,14 +72,6 @@ if [ -n "$USE_VPN" ]; then
     sudo service openvpn restart
     echo "Esperando..."
     sleep 10
-
-
-    echo "Curl a https://186.33.215.125/:"
-    echo $(curl  https://186.33.215.125/)
-    echo "Curl de ifconfig.me:"
-    echo $(curl ifconfig.me)
-
-
     echo "Verificando VPN..."
     echo "Revisando las interfaces de redes..."
     ifconfig -a | sed 's/[ \t].*//;/^$/d'