diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b1cc1ef7..d0c3f4b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,28 +31,16 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.8, 3.9] requirements-level: [pypi] - db-service: [postgresql11, postgresql13, mysql8] + db-service: [postgresql14] search-service: [opensearch2, elasticsearch7] node-version: [16.x] - exclude: - - python-version: 3.7 - db-service: postgresql13 - - - python-version: 3.7 - db-service: mysql8 - include: - search-service: opensearch2 SEARCH_EXTRAS: "opensearch2" - - search-service: elasticsearch7 SEARCH_EXTRAS: "elasticsearch7" - - - db-service: mysql8 - DB_EXTRAS: "mysql" - env: DB: ${{ matrix.db-service }} SEARCH: ${{ matrix.search-service }} diff --git a/run-tests.sh b/run-tests.sh index 47f9a68e..a591d295 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -24,7 +24,7 @@ trap cleanup EXIT python -m check_manifest python -m setup extract_messages --output-file /dev/null python -m sphinx.cmd.build -qnNW docs docs/_build/html -eval "$(docker-services-cli up --db ${DB:-mysql} --search ${ES:-opensearch} --mq ${CACHE:-redis} --env)" +eval "$(docker-services-cli up --db ${DB:-postgresql} --search ${ES:-opensearch} --mq ${CACHE:-redis} --env)" python -m pytest $@ tests_exit_code=$? exit "$tests_exit_code"