From a2296503d58dc281304795aeaf36561d3c19411f Mon Sep 17 00:00:00 2001 From: Tomer Nosrati Date: Wed, 20 Mar 2024 14:54:03 +0200 Subject: [PATCH] Stabilized CI --- .github/workflows/examples.yml | 16 ++++++++-------- .github/workflows/python-package.yml | 4 ++-- examples/django/requirements.txt | 1 + examples/hybrid_setup/requirements.txt | 1 + examples/myutils/requirements.txt | 1 + examples/myworker/requirements.txt | 1 + examples/rabbitmq_management/requirements.txt | 1 + examples/range/requirements.txt | 1 + examples/vhost/requirements.txt | 1 + examples/worker_pool/requirements.txt | 1 + 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 29683438..faf69e64 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -61,7 +61,7 @@ jobs: working-directory: examples/myworker timeout-minutes: 10 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError range: runs-on: ${{ matrix.os }} @@ -94,7 +94,7 @@ jobs: working-directory: examples/range timeout-minutes: 30 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError rabbitmq_management: runs-on: ${{ matrix.os }} @@ -127,7 +127,7 @@ jobs: working-directory: examples/rabbitmq_management timeout-minutes: 10 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError django: runs-on: ${{ matrix.os }} @@ -166,7 +166,7 @@ jobs: timeout-minutes: 10 run: | export DJANGO_SETTINGS_MODULE=proj.settings - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError myutils: runs-on: ${{ matrix.os }} @@ -199,7 +199,7 @@ jobs: working-directory: examples/myutils timeout-minutes: 10 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError worker_pool: runs-on: ${{ matrix.os }} @@ -232,7 +232,7 @@ jobs: working-directory: examples/worker_pool timeout-minutes: 10 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError hybrid_setup: runs-on: ${{ matrix.os }} @@ -265,7 +265,7 @@ jobs: working-directory: examples/hybrid_setup timeout-minutes: 10 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError vhost: runs-on: ${{ matrix.os }} @@ -298,4 +298,4 @@ jobs: working-directory: examples/vhost timeout-minutes: 10 run: | - pytest -xsv tests + pytest -xsv tests --reruns 3 --rerun-except AssertionError diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index a5d6ae54..1bdf27bd 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -122,7 +122,7 @@ jobs: - name: Run tox for "${{ matrix.python-version }}-integration" timeout-minutes: 15 run: | - tox --verbose --verbose -e "${{ matrix.python-version }}-integration" -- -n auto --reruns 2 --rerun-except AssertionError + tox --verbose --verbose -e "${{ matrix.python-version }}-integration" -- -n auto --reruns 3 --rerun-except AssertionError Smoke: needs: @@ -167,4 +167,4 @@ jobs: - name: Run tox for "${{ matrix.python-version }}-smoke" timeout-minutes: 30 run: | - tox --verbose --verbose -e "${{ matrix.python-version }}-smoke" -- -n auto --reruns 2 --rerun-except AssertionError + tox --verbose --verbose -e "${{ matrix.python-version }}-smoke" -- -n auto --reruns 3 --rerun-except AssertionError diff --git a/examples/django/requirements.txt b/examples/django/requirements.txt index f18d944c..b5c1b713 100644 --- a/examples/django/requirements.txt +++ b/examples/django/requirements.txt @@ -2,4 +2,5 @@ sqlalchemy>=1.2.18 django>=2.2.1 pytest-django>=4.7.0 pytest-xdist>=3.5.0 +pytest-rerunfailures>=14.0 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/hybrid_setup/requirements.txt b/examples/hybrid_setup/requirements.txt index 48e2a1f9..a5118b6a 100644 --- a/examples/hybrid_setup/requirements.txt +++ b/examples/hybrid_setup/requirements.txt @@ -1,5 +1,6 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-subtests>=0.11.0 +pytest-rerunfailures>=14.0 celery[gevent] pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/myutils/requirements.txt b/examples/myutils/requirements.txt index 08d00b8f..f31534b7 100644 --- a/examples/myutils/requirements.txt +++ b/examples/myutils/requirements.txt @@ -1,3 +1,4 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 +pytest-rerunfailures>=14.0 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/myworker/requirements.txt b/examples/myworker/requirements.txt index 08d00b8f..f31534b7 100644 --- a/examples/myworker/requirements.txt +++ b/examples/myworker/requirements.txt @@ -1,3 +1,4 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 +pytest-rerunfailures>=14.0 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/rabbitmq_management/requirements.txt b/examples/rabbitmq_management/requirements.txt index 08d00b8f..f31534b7 100644 --- a/examples/rabbitmq_management/requirements.txt +++ b/examples/rabbitmq_management/requirements.txt @@ -1,3 +1,4 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 +pytest-rerunfailures>=14.0 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/range/requirements.txt b/examples/range/requirements.txt index 37ff63df..4e1b78fa 100644 --- a/examples/range/requirements.txt +++ b/examples/range/requirements.txt @@ -1,4 +1,5 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-subtests>=0.11.0 +pytest-rerunfailures>=14.0 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/vhost/requirements.txt b/examples/vhost/requirements.txt index 08d00b8f..f31534b7 100644 --- a/examples/vhost/requirements.txt +++ b/examples/vhost/requirements.txt @@ -1,3 +1,4 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 +pytest-rerunfailures>=14.0 pytest-celery[all]@git+https://github.com/celery/pytest-celery.git diff --git a/examples/worker_pool/requirements.txt b/examples/worker_pool/requirements.txt index 48e2a1f9..a5118b6a 100644 --- a/examples/worker_pool/requirements.txt +++ b/examples/worker_pool/requirements.txt @@ -1,5 +1,6 @@ pytest>=7.4.4 pytest-xdist>=3.5.0 pytest-subtests>=0.11.0 +pytest-rerunfailures>=14.0 celery[gevent] pytest-celery[all]@git+https://github.com/celery/pytest-celery.git