diff --git a/.github/actions/regression-tests/action.yml b/.github/actions/regression-tests/action.yml index bafa6a1b7..f45db0134 100644 --- a/.github/actions/regression-tests/action.yml +++ b/.github/actions/regression-tests/action.yml @@ -26,7 +26,7 @@ runs: # timeout-minutes: 20 steps: - name: Run PyTests - id: first + id: main shell: bash run: | ls -l ${GITHUB_WORKSPACE}/ @@ -37,7 +37,7 @@ runs: export DRAGONFLY_PATH="${GITHUB_WORKSPACE}/${{inputs.build-folder-name}}/${{inputs.dfly-executable}}" export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 # to crash on errors - timeout 20m pytest -m "${{inputs.filter}}" --durations=10 --color=yes --json-report --json-report-file=report.json dragonfly --ignore=dragonfly/replication_test.py --log-cli-level=INFO || code=$? + timeout 40m pytest -m "${{inputs.filter}}" --durations=10 --color=yes --json-report --json-report-file=report.json dragonfly --log-cli-level=INFO || code=$? # timeout returns 124 if we exceeded the timeout duration if [[ $code -eq 124 ]]; then @@ -50,32 +50,6 @@ runs: exit 1 fi - - name: Run PyTests replication test - id: second - if: ${{ inputs.run-only-on-ubuntu-latest == 'true' || (inputs.run-only-on-ubuntu-latest == 'false' && matrix.runner == 'ubuntu-latest') }} - shell: bash - run: | - echo "Running PyTests replication test" - cd ${GITHUB_WORKSPACE}/tests - # used by PyTests - export DRAGONFLY_PATH="${GITHUB_WORKSPACE}/${{inputs.build-folder-name}}/${{inputs.dfly-executable}}" - - - timeout 20m pytest -m "${{inputs.filter}}" --durations=10 --color=yes --json-report \ - --json-report-file=rep1_report.json dragonfly/replication_test.py --log-cli-level=INFO \ - --df alsologtostderr $1 $2 || code=$? - - # timeout returns 124 if we exceeded the timeout duration - if [[ $code -eq 124 ]]; then - echo "TIMEDOUT=1">> "$GITHUB_OUTPUT" - exit 1 - fi - - # when a test fails in pytest it returns 1 but there are other return codes as well so we just check if the code is non zero - if [[ $code -ne 0 ]]; then - exit 1 - fi - - name: Print last log on timeout if: failure() shell: bash @@ -106,14 +80,7 @@ runs: } cd ${GITHUB_WORKSPACE}/tests failed_tests="" - # The order in of if is important, and expected to be the oposite order of the pytest run. - # As github runner will not run the next step if the pytest failed, we start from the last - # report file and if exist we get the failed test from the pytest run, if there are any. - if [ -f rep2_report.json ]; then - failed_tests=$(get_failed_tests rep2_report.json) - elif [ -f rep1_report.json ]; then - failed_tests=$(get_failed_tests rep1_report.json) - elif [ -f report.json ]; then + if [ -f report.json ]; then failed_tests=$(get_failed_tests report.json) fi diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index 8c5dc0cde..bdfd74bb6 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -41,7 +41,6 @@ jobs: with: dfly-executable: dragonfly gspace-secret: ${{ secrets.GSPACES_BOT_DF_BUILD }} - run-only-on-ubuntu-latest: false build-folder-name: build # This expression serves as a ternary operator, i.e. if the condition holds it returns # 'not NON_EXISTING_MARK' otherwise not opt_only. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c75f24d0c..03fbad63f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,7 +131,6 @@ jobs: with: dfly-executable: dragonfly-x86_64 gspace-secret: ${{ secrets.GSPACES_BOT_DF_BUILD }} - run-only-on-ubuntu-latest: true build-folder-name: ${{ env.RELEASE_DIR }} - name: Save artifacts run: | diff --git a/tests/dragonfly/cluster_test.py b/tests/dragonfly/cluster_test.py index aa2f65fc8..85f8d058c 100644 --- a/tests/dragonfly/cluster_test.py +++ b/tests/dragonfly/cluster_test.py @@ -1329,6 +1329,7 @@ async def test_cluster_config_reapply(df_local_factory: DflyInstanceFactory): await close_clients(*[node.client for node in nodes], *[node.admin_client for node in nodes]) +@pytest.mark.skip("flaky") @dfly_args({"proactor_threads": 4, "cluster_mode": "yes"}) async def test_cluster_migration_cancel(df_local_factory: DflyInstanceFactory): """Check data migration from one node to another."""