From 2d578e8ed0208991a04a40130c620488f1a07293 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 2 Apr 2024 18:14:38 +0100 Subject: [PATCH 1/2] Temporarily skip some tests on Rocky Linux 8 Arm64 --- .../functional/transport/ipc/test_pub_server_channel.py | 4 ++++ tests/pytests/functional/transport/server/test_req_channel.py | 4 ++++ .../functional/transport/zeromq/test_pub_server_channel.py | 4 ++++ tests/pytests/functional/utils/test_process.py | 4 ++++ tests/pytests/functional/utils/user/test_chugid_and_umask.py | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/tests/pytests/functional/transport/ipc/test_pub_server_channel.py b/tests/pytests/functional/transport/ipc/test_pub_server_channel.py index d0310762283..2ea4470b24d 100644 --- a/tests/pytests/functional/transport/ipc/test_pub_server_channel.py +++ b/tests/pytests/functional/transport/ipc/test_pub_server_channel.py @@ -17,6 +17,10 @@ pytestmark = [ pytest.mark.skip_on_spawning_platform( reason="These tests are currently broken on spawning platforms. Need to be rewritten.", ), + pytest.mark.skipif( + "grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'", + reason="Temporarily skip on Rocky Linux 8 Arm64", + ), ] diff --git a/tests/pytests/functional/transport/server/test_req_channel.py b/tests/pytests/functional/transport/server/test_req_channel.py index b49e808f273..2eac76d352c 100644 --- a/tests/pytests/functional/transport/server/test_req_channel.py +++ b/tests/pytests/functional/transport/server/test_req_channel.py @@ -23,6 +23,10 @@ pytestmark = [ reason="These tests are currently broken on spawning platforms. Need to be rewritten.", ), pytest.mark.slow_test, + pytest.mark.skipif( + "grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'", + reason="Temporarily skip on Rocky Linux 8 Arm64", + ), ] diff --git a/tests/pytests/functional/transport/zeromq/test_pub_server_channel.py b/tests/pytests/functional/transport/zeromq/test_pub_server_channel.py index 4e851a52fd3..50c8ff1c817 100644 --- a/tests/pytests/functional/transport/zeromq/test_pub_server_channel.py +++ b/tests/pytests/functional/transport/zeromq/test_pub_server_channel.py @@ -22,6 +22,10 @@ pytestmark = [ pytest.mark.skip_on_spawning_platform( reason="These tests are currently broken on spawning platforms. Need to be rewritten.", ), + pytest.mark.skipif( + "grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'", + reason="Temporarily skip on Rocky Linux 8 Arm64", + ), ] diff --git a/tests/pytests/functional/utils/test_process.py b/tests/pytests/functional/utils/test_process.py index bbb83638761..ed165ea3e91 100644 --- a/tests/pytests/functional/utils/test_process.py +++ b/tests/pytests/functional/utils/test_process.py @@ -24,6 +24,10 @@ def process_manager(): _process_manager.terminate() +@pytest.mark.skipif( + "grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'", + reason="Temporarily skip on Rocky Linux 8 Arm64", +) def test_process_manager_60749(process_manager): """ Regression test for issue #60749 diff --git a/tests/pytests/functional/utils/user/test_chugid_and_umask.py b/tests/pytests/functional/utils/user/test_chugid_and_umask.py index 1a02efb528a..95a76519a94 100644 --- a/tests/pytests/functional/utils/user/test_chugid_and_umask.py +++ b/tests/pytests/functional/utils/user/test_chugid_and_umask.py @@ -20,6 +20,10 @@ pytestmark = [ pytest.mark.skip_if_not_root, pytest.mark.skip_on_windows, pytest.mark.skip_initial_gh_actions_failure(skip=_check_skip), + pytest.mark.skipif( + "grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'", + reason="Temporarily skip on Rocky Linux 8 Arm64", + ), ] From 1998ba3424a56c1fc00a5845f447ca6ea9f8a514 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 3 Apr 2024 08:59:43 +0100 Subject: [PATCH 2/2] Remove extra logic missed in 68131ce7ab248255feb50436a8b1c6c44813c762 This allowed the tests in https://github.com/saltstack/salt/pull/66169 to pass when they shouldn't --- .github/workflows/test-action-macos.yml | 2 +- .github/workflows/test-action-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 6b03a6cb558..a57b4cb133d 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -179,7 +179,7 @@ jobs: - name: Run Changed Tests id: run-fast-changed-tests - if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] == false }} + if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }} env: SKIP_REQUIREMENTS_INSTALL: "1" PRINT_TEST_SELECTION: "0" diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml index 92b048f570e..bc187bca036 100644 --- a/.github/workflows/test-action-windows.yml +++ b/.github/workflows/test-action-windows.yml @@ -202,7 +202,7 @@ jobs: - name: Run Changed Tests id: run-fast-changed-tests - if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] == false }} + if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ matrix.fips && '--fips ' || '' }}${{ inputs.distro-slug }} \