ci: Bedrock - improve worfklow; skip tests from CI (#1773)

Author: anakin87

.github/workflows/amazon_bedrock.yml

@@ -27,7 +27,6 @@ env:
   PYTHONUNBUFFERED: "1"
   FORCE_COLOR: "1"
   AWS_REGION: us-east-1
-  HF_TOKEN: ${{ secrets.HF_TOKEN }}
 
 jobs:
   run:
@@ -68,15 +67,15 @@ jobs:
 
       # Do not authenticate on pull requests from forks
       - name: AWS authentication
+        id: aws-auth
         if: github.event.pull_request.head.repo.full_name == github.repository
         uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
 
-      # Do not run integration tests on pull requests from forks
       - name: Run integration tests
-        if: github.event.pull_request.head.repo.full_name == github.repository
+        if: success() && steps.aws-auth.outcome == 'success'
         run: hatch run cov-retry -m "integration"
 
       - name: Nightly - run unit tests with Haystack main branch

integrations/amazon_bedrock/tests/test_chat_generator.py

@@ -1,4 +1,3 @@
-import os
 from typing import Any, Dict, Optional
 
 import pytest
@@ -265,14 +264,8 @@ def test_prepare_request_params_tool_config(self, top_song_tool_config, mock_bot
         assert request_params["toolConfig"] == top_song_tool_config
 
 
+# In the CI, those tests are skipped if AWS Authentication fails
 @pytest.mark.integration
-@pytest.mark.skipif(
-    not os.environ.get("AWS_CI_ROLE_ARN", None) and not os.environ.get("AWS_REGION", None),
-    reason=(
-        "Skipping test because AWS_CI_ROLE_ARN and AWS_REGION environment variables are not set. "
-        "This test requires AWS credentials to run."
-    ),
-)
 class TestAmazonBedrockChatGeneratorInference:
     @pytest.mark.parametrize("model_name", MODELS_TO_TEST)
     def test_default_inference_params(self, model_name, chat_messages):
@@ -437,14 +430,8 @@ def test_pipeline_with_amazon_bedrock_chat_generator(self, model_name, tools):
         )
 
 
+# In the CI, those tests are skipped if AWS Authentication fails
 @pytest.mark.integration
-@pytest.mark.skipif(
-    not os.environ.get("AWS_CI_ROLE_ARN", None) and not os.environ.get("AWS_REGION", None),
-    reason=(
-        "Skipping test because AWS_CI_ROLE_ARN and AWS_REGION environment variables are not set. "
-        "This test requires AWS credentials to run."
-    ),
-)
 class TestAmazonBedrockChatGeneratorAsyncInference:
     """
     Test class for async inference functionality of AmazonBedrockChatGenerator

integrations/amazon_bedrock/tests/test_ranker.py

@@ -1,4 +1,3 @@
-import os
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -52,14 +51,8 @@ def test_bedrock_ranker_run(mock_aws_session):
     assert result["documents"][1].score == 0.7
 
 
+# In the CI, those tests are skipped if AWS Authentication fails
 @pytest.mark.integration
-@pytest.mark.skipif(
-    not os.environ.get("AWS_CI_ROLE_ARN", None) and not os.environ.get("AWS_REGION", None),
-    reason=(
-        "Skipping test because AWS_CI_ROLE_ARN and AWS_REGION environment variables are not set. "
-        "This test requires AWS credentials to run."
-    ),
-)
 def test_amazon_bedrock_ranker_live_run():
     ranker = AmazonBedrockRanker(
         model="cohere.rerank-v3-5:0",