From 2582989a1f4c3dbbd9474fdc1351caafca0999e5 Mon Sep 17 00:00:00 2001
From: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
Date: Wed, 27 Sep 2023 02:44:20 -0700
Subject: [PATCH] Remove the skip for macsec tests (#10132)

Summary:

Revert the PRs, to get the macsec tests run
#10101
#10088

co-authorized by: jianquanye@microsoft.com
---
 .azure-pipelines/pr_test_scripts.yaml                | 12 ++++++------
 azure-pipelines.yml                                  |  1 -
 .../conditional_mark/tests_mark_conditions.yaml      |  6 ------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.azure-pipelines/pr_test_scripts.yaml b/.azure-pipelines/pr_test_scripts.yaml
index 967dd5dd6a..9593f18768 100644
--- a/.azure-pipelines/pr_test_scripts.yaml
+++ b/.azure-pipelines/pr_test_scripts.yaml
@@ -76,12 +76,12 @@ t0-2vlans:
   - dhcp_relay/test_dhcpv6_relay.py
 
 t0-sonic:
-  # - bgp/test_bgp_fact.py
-  # - macsec/test_controlplane.py
-  # - macsec/test_dataplane.py
-  # - macsec/test_deployment.py
-  # - macsec/test_fault_handling.py
-  # - macsec/test_interop_protocol.py
+  - bgp/test_bgp_fact.py
+  - macsec/test_controlplane.py
+  - macsec/test_dataplane.py
+  - macsec/test_deployment.py
+  - macsec/test_fault_handling.py
+  - macsec/test_interop_protocol.py
   - pc/test_retry_count.py
   - platform_tests/test_advanced_reboot.py::test_warm_reboot
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 62d497a022..7da6858fdf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -142,7 +142,6 @@ stages:
           VM_TYPE: vsonic
           KVM_IMAGE_BRANCH: "master"
           MGMT_BRANCH: "master"
-          SCRIPTS_EXCLUDE: "bgp/test_bgp_fact.py"
 
   - job: dpu_elastictest
     displayName: "kvmtest-dpu by Elastictest"
diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
index 83e2278e2c..9adb96548d 100644
--- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
+++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
@@ -654,12 +654,6 @@ ipfwd/test_nhop_group.py::test_nhop_group_member_order_capability:
 #######################################
 #####           macsec            #####
 #######################################
-macsec:
-  skip:
-    reason: 'Skip for t0-sonic to prevent deadlock with code PR merge'
-    conditions:
-      - "'t0' in topo_name"
-
 macsec/test_dataplane.py::TestDataPlane::test_server_to_neighbor:
   skip:
     reason: 'test_server_to_neighbor needs downstream neighbors, which is not present in this topo'