From 0f049086813eb804320f9aca282d4b50809878e5 Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:35:49 +0200
Subject: [PATCH 1/7] GH Actions:change test selection parameter

---
 .github/workflows/aws-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aws-main.yml b/.github/workflows/aws-main.yml
index bba98eaa629f3..1d4118ae4bd53 100644
--- a/.github/workflows/aws-main.yml
+++ b/.github/workflows/aws-main.yml
@@ -76,7 +76,7 @@ jobs:
       # default "disableCaching" to `false` if it's a push or schedule event
       disableCaching: ${{ inputs.disableCaching == true }}
       # default "disableTestSelection" to `true` if it's a push or schedule event
-      disableTestSelection: ${{ inputs.enableTestSelection != true }}
+      disableTestSelection: ${{ inputs.enableTestSelection == false || github.event_name == 'push' }}
       PYTEST_LOGLEVEL: ${{ inputs.PYTEST_LOGLEVEL }}
     secrets:
       DOCKERHUB_PULL_USERNAME: ${{ secrets.DOCKERHUB_PULL_USERNAME }}

From fa497bd22c3b3caa4ac7fa3c54dfc806ff88dac7 Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 12:14:02 +0200
Subject: [PATCH 2/7] GH Actions:enable test selection

---
 .github/workflows/aws-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aws-main.yml b/.github/workflows/aws-main.yml
index 1d4118ae4bd53..1cdfc90a78a58 100644
--- a/.github/workflows/aws-main.yml
+++ b/.github/workflows/aws-main.yml
@@ -76,7 +76,7 @@ jobs:
       # default "disableCaching" to `false` if it's a push or schedule event
       disableCaching: ${{ inputs.disableCaching == true }}
       # default "disableTestSelection" to `true` if it's a push or schedule event
-      disableTestSelection: ${{ inputs.enableTestSelection == false || github.event_name == 'push' }}
+      disableTestSelection: true
       PYTEST_LOGLEVEL: ${{ inputs.PYTEST_LOGLEVEL }}
     secrets:
       DOCKERHUB_PULL_USERNAME: ${{ secrets.DOCKERHUB_PULL_USERNAME }}

From 6d442f3fffeaa530e7b837399eb01e05d114bac7 Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:20:29 +0200
Subject: [PATCH 3/7] GH Actions: enable tets selection

---
 .github/workflows/aws-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aws-main.yml b/.github/workflows/aws-main.yml
index 1cdfc90a78a58..2b98609e79929 100644
--- a/.github/workflows/aws-main.yml
+++ b/.github/workflows/aws-main.yml
@@ -76,7 +76,7 @@ jobs:
       # default "disableCaching" to `false` if it's a push or schedule event
       disableCaching: ${{ inputs.disableCaching == true }}
       # default "disableTestSelection" to `true` if it's a push or schedule event
-      disableTestSelection: true
+      disableTestSelection: false
       PYTEST_LOGLEVEL: ${{ inputs.PYTEST_LOGLEVEL }}
     secrets:
       DOCKERHUB_PULL_USERNAME: ${{ secrets.DOCKERHUB_PULL_USERNAME }}

From 4716c660df5593b689936345ade01da736b299da Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:17:17 +0200
Subject: [PATCH 4/7] GH Actions: run test with test selection on pull-request
 events

---
 .github/workflows/aws-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aws-main.yml b/.github/workflows/aws-main.yml
index 2b98609e79929..107b2b6660334 100644
--- a/.github/workflows/aws-main.yml
+++ b/.github/workflows/aws-main.yml
@@ -76,7 +76,7 @@ jobs:
       # default "disableCaching" to `false` if it's a push or schedule event
       disableCaching: ${{ inputs.disableCaching == true }}
       # default "disableTestSelection" to `true` if it's a push or schedule event
-      disableTestSelection: false
+      disableTestSelection: ${{ inputs.enableTestSelection == false || github.event_name == 'pull_request' }}
       PYTEST_LOGLEVEL: ${{ inputs.PYTEST_LOGLEVEL }}
     secrets:
       DOCKERHUB_PULL_USERNAME: ${{ secrets.DOCKERHUB_PULL_USERNAME }}

From 36513bb47ec56ed4ed09190c7f0c6ec51b762add Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:41:02 +0200
Subject: [PATCH 5/7] Gh ACtions: test selection condition

---
 .github/workflows/aws-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aws-main.yml b/.github/workflows/aws-main.yml
index 107b2b6660334..5857d9a79feb6 100644
--- a/.github/workflows/aws-main.yml
+++ b/.github/workflows/aws-main.yml
@@ -76,7 +76,7 @@ jobs:
       # default "disableCaching" to `false` if it's a push or schedule event
       disableCaching: ${{ inputs.disableCaching == true }}
       # default "disableTestSelection" to `true` if it's a push or schedule event
-      disableTestSelection: ${{ inputs.enableTestSelection == false || github.event_name == 'pull_request' }}
+      disableTestSelection: ${{ (inputs.enableTestSelection != '' && inputs.enableTestSelection) || github.event_name == 'push' }}
       PYTEST_LOGLEVEL: ${{ inputs.PYTEST_LOGLEVEL }}
     secrets:
       DOCKERHUB_PULL_USERNAME: ${{ secrets.DOCKERHUB_PULL_USERNAME }}

From 28b44325bef215c38917ccc0e8076a266f67c1b2 Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:59:57 +0200
Subject: [PATCH 6/7] GH Actions: test selection

---
 tests/aws/services/kms/test_kms.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/aws/services/kms/test_kms.py b/tests/aws/services/kms/test_kms.py
index 4b68dd9c38dce..7cafdac94f223 100644
--- a/tests/aws/services/kms/test_kms.py
+++ b/tests/aws/services/kms/test_kms.py
@@ -134,6 +134,9 @@ def test_create_key(
         assert response["KeyId"] == key_id
         assert f":{region_name}:" in response["Arn"]
         assert f":{account_id}:" in response["Arn"]
+        assert f":{region_name}:" in response["Arn"]
+        assert f":{account_id}:" in response["Arn"]
+        assert response["KeyId"] != "tst"
 
     @markers.aws.validated
     def test_tag_existing_key_and_untag(

From 472ffcba0c1bbffe641595877b4f020a7d673af5 Mon Sep 17 00:00:00 2001
From: Anastasia Dusak <61540676+k-a-il@users.noreply.github.com>
Date: Wed, 4 Jun 2025 16:14:20 +0200
Subject: [PATCH 7/7] Revert "GH Actions: test selection"

This reverts commit 28b44325bef215c38917ccc0e8076a266f67c1b2.
---
 tests/aws/services/kms/test_kms.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/aws/services/kms/test_kms.py b/tests/aws/services/kms/test_kms.py
index 7cafdac94f223..4b68dd9c38dce 100644
--- a/tests/aws/services/kms/test_kms.py
+++ b/tests/aws/services/kms/test_kms.py
@@ -134,9 +134,6 @@ def test_create_key(
         assert response["KeyId"] == key_id
         assert f":{region_name}:" in response["Arn"]
         assert f":{account_id}:" in response["Arn"]
-        assert f":{region_name}:" in response["Arn"]
-        assert f":{account_id}:" in response["Arn"]
-        assert response["KeyId"] != "tst"
 
     @markers.aws.validated
     def test_tag_existing_key_and_untag(