From 35a8255dedbdf28f3c3dfb1962f71ec55346fd3e Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 4 Nov 2020 18:39:34 +0000 Subject: [PATCH] Ditch all travis config except for elasticsearch 2 test --- .travis.yml | 50 ------------------------ scripts/travis/install_elasticsearch5.sh | 3 -- scripts/travis/install_elasticsearch6.sh | 3 -- scripts/travis/install_elasticsearch7.sh | 3 -- 4 files changed, 59 deletions(-) delete mode 100755 scripts/travis/install_elasticsearch5.sh delete mode 100755 scripts/travis/install_elasticsearch6.sh delete mode 100755 scripts/travis/install_elasticsearch7.sh diff --git a/.travis.yml b/.travis.yml index d0fb160cb7..cd37efcaff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,68 +2,18 @@ language: python cache: pip dist: xenial -addons: - postgresql: "9.6" - matrix: include: - - env: TOXENV=py36-dj22-mysql-noelasticsearch - python: 3.6 - - env: TOXENV=py37-dj30-sqlite-noelasticsearch - python: 3.7 - - env: TOXENV=py38-dj31-postgres-noelasticsearch - python: 3.8 - - env: TOXENV=py39-dj31-mysql-noelasticsearch - python: 3.9 - - env: TOXENV=py39-dj31-sqlite-noelasticsearch - python: 3.9 - - env: TOXENV=py39-dj31-postgres-noelasticsearch-emailuser - python: 3.9 - - env: TOXENV=py39-dj31-postgres-noelasticsearch-notz - python: 3.9 - - env: TOXENV=py39-dj31stable-postgres-noelasticsearch - python: 3.9 - - env: TOXENV=py39-djmaster-postgres-noelasticsearch - python: 3.9 - env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes python: 3.6 - - env: TOXENV=py37-dj30-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes - python: 3.7 - - env: TOXENV=py38-dj31-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - python: 3.8 - - env: TOXENV=py39-dj31-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes - python: 3.9 - - env: TOXENV=py39-dj31-sqlite-elasticsearch7-emailuser INSTALL_ELASTICSEARCH7=yes - python: 3.9 allow_failures: # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky - env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes - - env: TOXENV=py37-dj30-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes - - env: TOXENV=py38-dj31-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - - env: TOXENV=py39-dj31-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes - - env: TOXENV=py39-dj31-sqlite-elasticsearch7-emailuser INSTALL_ELASTICSEARCH7=yes - # allow failures against Django pre-releases on git - - env: TOXENV=py39-dj31stable-postgres-noelasticsearch - - env: TOXENV=py39-djmaster-postgres-noelasticsearch - -# Services -services: - - elasticsearch - - mysql # Package installation install: - pip install tox codecov - 'if [[ -n "$INSTALL_ELASTICSEARCH2" ]]; then ./scripts/travis/install_elasticsearch2.sh; fi' - - 'if [[ -n "$INSTALL_ELASTICSEARCH5" ]]; then ./scripts/travis/install_elasticsearch5.sh; fi' - - 'if [[ -n "$INSTALL_ELASTICSEARCH6" ]]; then ./scripts/travis/install_elasticsearch6.sh; fi' - - 'if [[ -n "$INSTALL_ELASTICSEARCH7" ]]; then ./scripts/travis/install_elasticsearch7.sh; fi' - -# Pre-test configuration -before_script: - - psql -c 'create database wagtaildemo;' -U postgres - - mysql -e "SET GLOBAL wait_timeout = 36000;" - - mysql -e "SET GLOBAL max_allowed_packet = 134209536;" # Run the tests script: diff --git a/scripts/travis/install_elasticsearch5.sh b/scripts/travis/install_elasticsearch5.sh deleted file mode 100755 index e9cb7418eb..0000000000 --- a/scripts/travis/install_elasticsearch5.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.3.3.deb && sudo dpkg -i --force-confnew elasticsearch-5.3.3.deb && sudo service elasticsearch restart diff --git a/scripts/travis/install_elasticsearch6.sh b/scripts/travis/install_elasticsearch6.sh deleted file mode 100755 index 922e6cc775..0000000000 --- a/scripts/travis/install_elasticsearch6.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.1.0.deb && sudo dpkg -i --force-confnew elasticsearch-6.1.0.deb && sudo service elasticsearch restart diff --git a/scripts/travis/install_elasticsearch7.sh b/scripts/travis/install_elasticsearch7.sh deleted file mode 100755 index 9214a2b2b9..0000000000 --- a/scripts/travis/install_elasticsearch7.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.4.0-amd64.deb && sudo dpkg -i --force-confnew elasticsearch-7.4.0-amd64.deb && sudo sed -i.old 's/-Xms1g/-Xms128m/' /etc/elasticsearch/jvm.options && sudo sed -i.old 's/-Xmx1g/-Xmx128m/' /etc/elasticsearch/jvm.options && echo -e '-XX:+DisableExplicitGC\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dlog4j.skipJansi=true\n-server\n' | sudo tee -a /etc/elasticsearch/jvm.options && sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch && sudo service elasticsearch restart