testssssss

.azure-pipelines/pr_test_scripts.yaml

@@ -678,6 +678,7 @@ t1-lag-vpp:
   - bgp/test_traffic_shift_sup.py
   - crm/test_crm.py
   - crm/test_crm_available.py
+  - decap/test_decap.py
   - dns/static_dns/test_static_dns.py
   - dns/test_dns_resolv_conf.py
   - drop_packets/test_drop_counters.py
@@ -691,6 +692,7 @@ t1-lag-vpp:
   - ipfwd/test_mtu.py
   - ipfwd/test_dip_sip.py
   - lldp/test_lldp.py
+  - lldp/test_lldp_syncd.py
   - log_fidelity/test_bgp_shutdown.py
   - pc/test_po_voq.py
   - pc/test_lag_member.py

.azure-pipelines/pr_test_template.yml

@@ -33,6 +33,10 @@ parameters:
   type: string
   default: ""
 
+- name: PTF_IMAGE_TAG
+  type: string
+  default: ""
+
 - name: PTF_MODIFIED
   type: string
   default: "False"
@@ -63,13 +67,21 @@ parameters:
   type: object
   default: {}
 
+- name: MGMT_BRANCH
+  type: string
+  default: $(BUILD_BRANCH)
+
+- name: KVM_IMAGE_BRANCH
+  type: string
+  default: $(BUILD_BRANCH)
+
 - name: KVM_BUILD_ID
   type: string
   default: ""
 
 - name: INCLUDE_JOBS
   type: string
-  default: "t0_job,t1_job,t2_job,t0_2vlans_job,t0_sonic_job,dpu_job,t1_multi_asic_job,t1_lag_vpp_job"
+  default: "all"
 
 jobs:
   - job: get_impacted_area
@@ -127,15 +139,16 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t0
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           COMMON_EXTRA_PARAMS: "--disable_sai_validation "
           ${{ each param in parameters.OVERRIDE_PARAMS }}:
             ${{ param.key }}: ${{ param.value }}
@@ -170,16 +183,17 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t0
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
           DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           COMMON_EXTRA_PARAMS: "--disable_sai_validation "
           ${{ each param in parameters.OVERRIDE_PARAMS }}:
             ${{ param.key }}: ${{ param.value }}
@@ -214,15 +228,16 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t1-lag
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           COMMON_EXTRA_PARAMS: "--disable_sai_validation "
           ${{ each param in parameters.OVERRIDE_PARAMS }}:
             ${{ param.key }}: ${{ param.value }}
@@ -257,16 +272,17 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: dualtor
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer --disable_sai_validation "
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           ${{ each param in parameters.OVERRIDE_PARAMS }}:
             ${{ param.key }}: ${{ param.value }}
 
@@ -300,17 +316,18 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t0-64-32
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --disable_sai_validation "
           VM_TYPE: vsonic
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           SPECIFIC_PARAM: '[
               {"name": "bgp/test_bgp_fact.py", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"},
               {"name": "macsec", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"}
@@ -348,15 +365,16 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: dpu
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           COMMON_EXTRA_PARAMS: "--disable_sai_validation "
           SPECIFIC_PARAM: '[
               {"name": "dash/test_dash_vnet.py", "param": "--skip_dataplane_checking"}
@@ -395,16 +413,17 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t1-8-lag
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
           NUM_ASIC: 4
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           COMMON_EXTRA_PARAMS: "--disable_sai_validation "
           ${{ each param in parameters.OVERRIDE_PARAMS }}:
             ${{ param.key }}: ${{ param.value }}
@@ -440,15 +459,16 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t2
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           COMMON_EXTRA_PARAMS: "--disable_sai_validation "
           ${{ each param in parameters.OVERRIDE_PARAMS }}:
             ${{ param.key }}: ${{ param.value }}
@@ -483,15 +503,16 @@ jobs:
           TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
           MAX_RUN_TEST_MINUTES: ${{ parameters.MAX_RUN_TEST_MINUTES }}
           MGMT_COMMIT_HASH: ${{ parameters.MGMT_COMMIT_HASH }}
+          PTF_IMAGE_TAG: ${{ parameters.PTF_IMAGE_TAG }}
           PTF_MODIFIED: ${{ parameters.PTF_MODIFIED }}
           EXPECTED_RESULT: ${{ parameters.EXPECTED_RESULT }}
           TOPOLOGY: t1-lag-vpp
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          KVM_IMAGE_BRANCH: ${{ parameters.KVM_IMAGE_BRANCH }}
           KVM_BUILD_ID: ${{ parameters.KVM_BUILD_ID }}
-          MGMT_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }}
           ASIC_TYPE: "vpp"
           KVM_IMAGE_BUILD_PIPELINE_ID: "2818"
           COMMON_EXTRA_PARAMS: "--disable_sai_validation --disable_loganalyzer"

.github/.code-reviewers/auto-assign.py

@@ -1,6 +1,7 @@
 from collections import Counter, deque
+import fnmatch
 import os
-from shutil import unregister_unpack_format
+import re
 import yaml
 
 from github import Auth, Github
@@ -14,6 +15,95 @@
 INCLUDE_CONTRIBUTORS_TIES = os.environ.get(
     "INCLUDE_CONTRIBUTORS_TIES", "False"
 ).strip().lower() not in ("", "false", "f", "0", "no", "n", "off", "disabled")
+SKIP_EXPIRY_CONFIG_PATH = os.environ.get(
+    "SKIP_EXPIRY_CONFIG_PATH", ".github/SKIP_EXPIRY_CONFIG.yaml"
+)
+
+CONDITIONAL_MARK_GLOB_PATTERNS = (
+    "tests/common/plugins/conditional_mark/tests_mark_conditions*.yaml",
+    "tests/common/plugins/conditional_mark/tests_mark_conditions*.yml",
+)
+RELEASE_BRANCH_PATTERN = re.compile(r"^202\d{3}$")
+CONDITIONAL_MARK_NOTE_MARKER = "<!-- skip-expiry-conditional-mark-review-note -->"
+
+
+def is_master_or_release_branch(branch_name: str) -> bool:
+    return branch_name in {"master", "main"} or bool(
+        RELEASE_BRANCH_PATTERN.fullmatch(branch_name)
+    )
+
+
+def load_skip_expiry_maintainers(config_path: str) -> list[str]:
+    with open(config_path, "r", encoding="utf-8") as config_file:
+        config = yaml.safe_load(config_file) or {}
+
+    maintainers = config.get("maintainers", [])
+    if not isinstance(maintainers, list):
+        return []
+
+    return [
+        str(maintainer).strip().lstrip("@")
+        for maintainer in maintainers
+        if str(maintainer).strip()
+    ]
+
+
+def matches_conditional_mark_file(filename: str) -> bool:
+    return any(
+        fnmatch.fnmatch(filename, file_pattern)
+        for file_pattern in CONDITIONAL_MARK_GLOB_PATTERNS
+    )
+
+
+def tag_skip_maintainers_if_change_to_conditional_mark(
+    pull_request, changed_files: list[str]
+) -> None:
+    if not is_master_or_release_branch(pull_request.base.ref):
+        base_branch = pull_request.base.ref
+        print(
+            f"Skipping conditional-mark maintainer note: base branch '{base_branch}' "
+            "is not master/main/release"
+        )
+        return
+
+    has_conditional_mark_changes = any(
+        matches_conditional_mark_file(changed_file) for changed_file in changed_files
+    )
+    if not has_conditional_mark_changes:
+        print(
+            "Skipping conditional-mark maintainer note: "
+            "no conditional-mark files were changed"
+        )
+        return
+
+    try:
+        maintainers = load_skip_expiry_maintainers(SKIP_EXPIRY_CONFIG_PATH)
+    except Exception as error:
+        print(f"Failed to load skip-expiry maintainers from '{SKIP_EXPIRY_CONFIG_PATH}': {error}")
+        return
+
+    if not maintainers:
+        print("Skipping conditional-mark maintainer note: no maintainers found")
+        return
+
+    existing_comments = pull_request.get_issue_comments()
+    for comment in existing_comments:
+        if CONDITIONAL_MARK_NOTE_MARKER in comment.body:
+            print("Conditional-mark maintainer note already exists, skipping new comment")
+            return
+
+    maintainers_mentions = " ".join(f"@{maintainer}" for maintainer in maintainers)
+    note = (
+        f"{CONDITIONAL_MARK_NOTE_MARKER}\n"
+        f"{maintainers_mentions} A user wants to merge changes to "
+        f"the conditional mark files into `{pull_request.base.ref}`. "
+        "Please review."
+    )
+    pull_request.create_issue_comment(note)
+    print(
+        f"Posted conditional-mark maintainer note for PR #{pull_request.number} to: {maintainers}"
+    )
+
 
 # using an access token
 auth = Auth.Token(GITHUB_TOKEN)
@@ -38,11 +128,12 @@
 # Until the sufficient number of reviewers are found
 updated_folders = []
 reviewer_candidates = Counter[str, int]()
+changed_files = [changed_file.filename for changed_file in pr.get_files()]
 
 # First bring each changed path to where any reviwer exists
-for changed_file in pr.get_files():
+for changed_file in changed_files:
     # remove the filename, add "/" to the front
-    changed_path = os.path.join(os.sep, os.path.dirname(changed_file.filename))
+    changed_path = os.path.join(os.sep, os.path.dirname(changed_file))
     print(f"Processing changed path {changed_path}")
     while changed_path not in reviewer_index:
         if changed_path in seen_folders:
@@ -114,3 +205,5 @@
 else:
     print("No reviewers found for this PR!")
 
+
+tag_skip_maintainers_if_change_to_conditional_mark(pr, changed_files)

.github/workflows/assignReviewers.yaml

@@ -26,9 +26,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           REVIEWER_INDEX: .github/.code-reviewers/pr_reviewer-by-files.yml
+          SKIP_EXPIRY_CONFIG_PATH: .github/SKIP_EXPIRY_CONFIG.yaml
           NEEDED_REVIEWER_COUNT: 3
           INCLUDE_CONTRIBUTORS_TIES: True
-          
+
       - name: Cleanup the checked out repo
         run: git clean -fdx
-

ansible/TestbedProcessing.py

@@ -167,7 +167,7 @@ def makeMain(data, outfile):
         }
     }
     with open(outfile, "w") as toWrite:
-        toWrite.write("supported_vm_types: [ 'veos', 'ceos', 'vsonic' ]\n"),
+        toWrite.write("supported_vm_types: [ 'veos', 'ceos', 'vsonic', 'csonic' ]\n"),
         yaml.dump(dictData, stream=toWrite, default_flow_style=False)
         toWrite.write("# proxy\n")
         yaml.dump(proxy, stream=toWrite, default_flow_style=False)

ansible/ansible.cfg

@@ -26,7 +26,9 @@ transport      = smart
 module_lang    = C
 max_diff_size  = 512000
 
-interpreter_python = auto_legacy_silent
+# auto_legacy_silent is deprecated; use auto instead
+# https://docs.ansible.com/projects/ansible/latest/reference_appendices/interpreter_discovery.html
+interpreter_python = auto
 
 # plays will gather facts by default, which contain information about
 # the remote system.