Merge branch 'dev' into inf-url

Author: navinsoni

tests/integ/sagemaker/lineage/conftest.py

@@ -45,9 +45,9 @@
 
 SLEEP_TIME_SECONDS = 1
 SLEEP_TIME_TWO_SECONDS = 2
-STATIC_PIPELINE_NAME = "SdkIntegTestStaticPipeline17"
-STATIC_ENDPOINT_NAME = "SdkIntegTestStaticEndpoint17"
-STATIC_MODEL_PACKAGE_GROUP_NAME = "SdkIntegTestStaticPipeline17ModelPackageGroup"
+STATIC_PIPELINE_NAME = "SdkIntegTestStaticPipeline20"
+STATIC_ENDPOINT_NAME = "SdkIntegTestStaticEndpoint20"
+STATIC_MODEL_PACKAGE_GROUP_NAME = "SdkIntegTestStaticPipeline20ModelPackageGroup"
 
 
 @pytest.fixture

tests/integ/sagemaker/lineage/test_action.py

@@ -139,12 +139,15 @@ def test_downstream_artifacts(static_approval_action):
 
 
 def test_datasets(static_approval_action, static_dataset_artifact, sagemaker_session):
+    try:
+        sagemaker_session.sagemaker_client.add_association(
+            SourceArn=static_dataset_artifact.artifact_arn,
+            DestinationArn=static_approval_action.action_arn,
+            AssociationType="ContributedTo",
+        )
+    except Exception:
+        print("Source and Destination association already exists.")
 
-    sagemaker_session.sagemaker_client.add_association(
-        SourceArn=static_dataset_artifact.artifact_arn,
-        DestinationArn=static_approval_action.action_arn,
-        AssociationType="ContributedTo",
-    )
     time.sleep(3)
     artifacts_from_query = static_approval_action.datasets()
 
@@ -153,10 +156,13 @@ def test_datasets(static_approval_action, static_dataset_artifact, sagemaker_ses
         assert "artifact" in artifact.artifact_arn
         assert artifact.artifact_type == "DataSet"
 
-    sagemaker_session.sagemaker_client.delete_association(
-        SourceArn=static_dataset_artifact.artifact_arn,
-        DestinationArn=static_approval_action.action_arn,
-    )
+    try:
+        sagemaker_session.sagemaker_client.delete_association(
+            SourceArn=static_dataset_artifact.artifact_arn,
+            DestinationArn=static_approval_action.action_arn,
+        )
+    except Exception:
+        pass
 
 
 def test_endpoints(static_approval_action):

tests/integ/test_workflow.py

@@ -67,6 +67,7 @@
     ConditionLessThanOrEqualTo,
 )
 from sagemaker.workflow.condition_step import ConditionStep
+from sagemaker.workflow.condition_step import JsonGet as ConditionStepJsonGet
 from sagemaker.workflow.callback_step import (
     CallbackStep,
     CallbackOutput,
@@ -2831,7 +2832,7 @@ def test_end_to_end_pipeline_successful_execution(
 
     # define condition step
     cond_lte = ConditionLessThanOrEqualTo(
-        left=JsonGet(
+        left=ConditionStepJsonGet(
             step=step_eval,
             property_file=evaluation_report,
             json_path="regression_metrics.mse.value",