Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ssip]: Update config generator #10991

Merged
merged 4 commits into from
Jul 20, 2022
Merged

Conversation

nazariig
Copy link
Collaborator

@nazariig nazariig commented May 31, 2022

HLD: sonic-net/SONiC#1002

Example:

root@sonic:/home/admin# cat /etc/rsyslog.conf | grep "^*.*"
*.* action(type="omfwd" target="10.0.0.5" protocol="udp" address="1.1.1.1" port="514")
*.* action(type="omfwd" target="10.0.0.6" protocol="udp" address="1.1.1.1" port="514" device="mgmt")

sonic-utilities

ea11b22 [sonic-bootchart] add sonic-bootchart (#2195)
8e5d478 [ssip]: Add CLI (#2191)
1dacb7f Replace pyswsssdk with swsscommon (#2251)

Why I did it

  • To implement Syslog Source IP feature
  • In order to include the following commit: 8e5d478 [ssip]: Add CLI (#2191)

How I did it

  • Updated syslog config template
  • Advanced submodule

How to verify it

  1. make configure PLATFORM=mellanox
  2. make target/sonic-mellanox.bin

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

  • N/A

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

      .---.        .-----------
     /     \  __  /    ------
    / /     \(  )/    -----
   //////   ' \/ `   ---
  //// / // :    : ---
 // /   /  /`    '--
//          //..\\
       ====UU====UU====
           '//||\\`
             ''``

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 1, 2022

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 1, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 2, 2022

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 10991 in repo Azure/sonic-buildimage

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 2, 2022

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 10991 in repo Azure/sonic-buildimage

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 2, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 2, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 7, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nazariig
Copy link
Collaborator Author

nazariig commented Jun 7, 2022

Step kvmtest-t0-sonic is constantly failing:

2022-06-07T14:03:18.3526699Z ==================================== ERRORS ====================================
2022-06-07T14:03:18.3528703Z ______________ ERROR at setup of test_bgp_facts[128-vlab-02-None] ______________
2022-06-07T14:03:18.3529013Z 
2022-06-07T14:03:18.3529613Z localhost = <tests.common.devices.local.Localhost object at 0x7f4bb9d07990>
2022-06-07T14:03:18.3530739Z duthosts = [<MultiAsicSonicHost vlab-02>]
2022-06-07T14:03:18.3532147Z request = <SubRequest 'sanity_check' for <Function test_bgp_facts[128-vlab-02-None]>>
2022-06-07T14:03:18.3532937Z fanouthosts = {}
2022-06-07T14:03:18.3534529Z nbrhosts = {'ARISTA01T1': <SonicHost VM0100>, 'ARISTA02T1': <SonicHost VM0101>, 'ARISTA03T1': <SonicHost VM0102>, 'ARISTA04T1': <SonicHost VM0103>}
2022-06-07T14:03:18.3535812Z tbinfo = {'auto_recover': 'False', 'comment': 'Tests virtual switch vm', 'conf-name': 'vms-kvm-t0-64-32', 'duts': ['vlab-02'], ...}
2022-06-07T14:03:18.3536463Z 
2022-06-07T14:03:18.3537108Z     @pytest.fixture(scope="module", autouse=True)
2022-06-07T14:03:18.3538007Z     def sanity_check(localhost, duthosts, request, fanouthosts, nbrhosts, tbinfo):
2022-06-07T14:03:18.3538787Z         logger.info("Prepare sanity check")
2022-06-07T14:03:18.3539296Z     
2022-06-07T14:03:18.3539747Z         skip_sanity = False
2022-06-07T14:03:18.3540262Z         allow_recover = False
2022-06-07T14:03:18.3540823Z         recover_method = "adaptive"
2022-06-07T14:03:18.3541587Z         pre_check_items = copy.deepcopy(SUPPORTED_CHECKS)  # Default check items
2022-06-07T14:03:18.3542446Z         post_check = False
2022-06-07T14:03:18.3542853Z     
2022-06-07T14:03:18.3543343Z         customized_sanity_check = None
2022-06-07T14:03:18.3543920Z         for m in request.node.iter_markers():
2022-06-07T14:03:18.3544917Z             logger.info("Found marker: m.name=%s, m.args=%s, m.kwargs=%s" % (m.name, m.args, m.kwargs))
2022-06-07T14:03:18.3545834Z             if m.name == "sanity_check":
2022-06-07T14:03:18.3546459Z                 customized_sanity_check = m
2022-06-07T14:03:18.3546957Z                 break
2022-06-07T14:03:18.3547345Z     
2022-06-07T14:03:18.3547851Z         if customized_sanity_check:
2022-06-07T14:03:18.3548507Z             logger.info("Process marker {} in script. m.args={}, m.kwargs={}"
2022-06-07T14:03:18.3549923Z                 .format(customized_sanity_check.name, customized_sanity_check.args, customized_sanity_check.kwargs))
2022-06-07T14:03:18.3551644Z             skip_sanity = customized_sanity_check.kwargs.get("skip_sanity", False)
2022-06-07T14:03:18.3552744Z             allow_recover = customized_sanity_check.kwargs.get("allow_recover", False)
2022-06-07T14:03:18.3553679Z             recover_method = customized_sanity_check.kwargs.get("recover_method", "adaptive")
2022-06-07T14:03:18.3554816Z             if allow_recover and recover_method not in constants.RECOVER_METHODS:
2022-06-07T14:03:18.3555916Z                 pytest.warning("Unsupported recover method")
2022-06-07T14:03:18.3557369Z                 logger.info("Fall back to use default recover method 'config_reload'")
2022-06-07T14:03:18.3558308Z                 recover_method = "config_reload"
2022-06-07T14:03:18.3558803Z     
2022-06-07T14:03:18.3559322Z             pre_check_items = _update_check_items(
2022-06-07T14:03:18.3559936Z                 pre_check_items,
2022-06-07T14:03:18.3560748Z                 customized_sanity_check.kwargs.get("check_items", []),
2022-06-07T14:03:18.3561440Z                 SUPPORTED_CHECKS)
2022-06-07T14:03:18.3592980Z     
2022-06-07T14:03:18.3593772Z             post_check = customized_sanity_check.kwargs.get("post_check", False)
2022-06-07T14:03:18.3595417Z     
2022-06-07T14:03:18.3596131Z         if request.config.option.skip_sanity:
2022-06-07T14:03:18.3596720Z             skip_sanity = True
2022-06-07T14:03:18.3597243Z         if skip_sanity:
2022-06-07T14:03:18.3598198Z             logger.info("Skip sanity check according to command line argument or configuration of test script.")
2022-06-07T14:03:18.3599002Z             yield
2022-06-07T14:03:18.3602012Z             return
2022-06-07T14:03:18.3603827Z     
2022-06-07T14:03:18.3605950Z         if request.config.option.allow_recover:
2022-06-07T14:03:18.3607766Z             allow_recover = True
2022-06-07T14:03:18.3609574Z     
2022-06-07T14:03:18.3611564Z         if request.config.option.recover_method:
2022-06-07T14:03:18.3614488Z             recover_method = request.config.getoption("--recover_method")
2022-06-07T14:03:18.3615537Z     
2022-06-07T14:03:18.3618451Z         if request.config.option.post_check:
2022-06-07T14:03:18.3621411Z             post_check = True
2022-06-07T14:03:18.3621874Z     
2022-06-07T14:03:18.3624165Z         cli_check_items = request.config.getoption("--check_items")
2022-06-07T14:03:18.3625444Z         cli_post_check_items = request.config.getoption("--post_check_items")
2022-06-07T14:03:18.3626606Z     
2022-06-07T14:03:18.3628381Z         if cli_check_items:
2022-06-07T14:03:18.3630089Z             logger.info('Fine tune pre-test check items based on CLI option --check_items')
2022-06-07T14:03:18.3631992Z             cli_items_list=str(cli_check_items).split(',')
2022-06-07T14:03:18.3633405Z             pre_check_items = _update_check_items(pre_check_items, cli_items_list, SUPPORTED_CHECKS)
2022-06-07T14:03:18.3634084Z     
2022-06-07T14:03:18.3636053Z         pre_check_items = filter_check_items(tbinfo, pre_check_items)  # Filter out un-supported checks.
2022-06-07T14:03:18.3636851Z     
2022-06-07T14:03:18.3637690Z         if post_check:
2022-06-07T14:03:18.3639618Z             # Prepare post test check items based on the collected pre test check items.
2022-06-07T14:03:18.3640499Z             post_check_items = copy.copy(pre_check_items)
2022-06-07T14:03:18.3641666Z             if customized_sanity_check:
2022-06-07T14:03:18.3642482Z                 post_check_items = _update_check_items(
2022-06-07T14:03:18.3643817Z                     post_check_items,
2022-06-07T14:03:18.3644508Z                     customized_sanity_check.kwargs.get("post_check_items", []),
2022-06-07T14:03:18.3645909Z                     SUPPORTED_CHECKS)
2022-06-07T14:03:18.3646397Z     
2022-06-07T14:03:18.3646870Z             if cli_post_check_items:
2022-06-07T14:03:18.3651256Z                 logger.info('Fine tune post-test check items based on CLI option --post_check_items')
2022-06-07T14:03:18.3652611Z                 cli_post_items_list = str(cli_post_check_items).split(',')
2022-06-07T14:03:18.3654265Z                 post_check_items = _update_check_items(post_check_items, cli_post_items_list, SUPPORTED_CHECKS)
2022-06-07T14:03:18.3655026Z     
2022-06-07T14:03:18.3656472Z             post_check_items = filter_check_items(tbinfo, post_check_items)  # Filter out un-supported checks.
2022-06-07T14:03:18.3657301Z         else:
2022-06-07T14:03:18.3657808Z             post_check_items = set()
2022-06-07T14:03:18.3658600Z     
2022-06-07T14:03:18.3659536Z         logger.info("Sanity check settings: skip_sanity=%s, pre_check_items=%s, allow_recover=%s, recover_method=%s, post_check=%s, post_check_items=%s" % \
2022-06-07T14:03:18.3660749Z             (skip_sanity, pre_check_items, allow_recover, recover_method, post_check, post_check_items))
2022-06-07T14:03:18.3661496Z     
2022-06-07T14:03:18.3662258Z         pre_post_check_items = pre_check_items + [item for item in post_check_items if item not in pre_check_items]
2022-06-07T14:03:18.3663154Z         for item in pre_post_check_items:
2022-06-07T14:03:18.3663945Z             request.fixturenames.append(item)
2022-06-07T14:03:18.3664538Z     
2022-06-07T14:03:18.3664999Z             # Workaround for pytest requirement.
2022-06-07T14:03:18.3665865Z             # Each possibly used check fixture must be executed in setup phase. Otherwise there could be teardown error.
2022-06-07T14:03:18.3666716Z             request.getfixturevalue(item)
2022-06-07T14:03:18.3667379Z     
2022-06-07T14:03:18.3667851Z         if pre_check_items:
2022-06-07T14:03:18.3669474Z             logger.info("Start pre-test sanity checks")
2022-06-07T14:03:18.3670081Z     
2022-06-07T14:03:18.3670607Z             # Dynamically attach selected check fixtures to node
2022-06-07T14:03:18.3671314Z             for item in set(pre_check_items):
2022-06-07T14:03:18.3671942Z                 request.fixturenames.append(item)
2022-06-07T14:03:18.3673367Z             dual_tor = 'dualtor' in tbinfo['topo']['name']
2022-06-07T14:03:18.3714824Z             print_logs(duthosts, print_dual_tor_logs=dual_tor)
2022-06-07T14:03:18.3715580Z     
2022-06-07T14:03:18.3716258Z             check_results = do_checks(request, pre_check_items, stage=STAGE_PRE_TEST)
2022-06-07T14:03:18.3718289Z             logger.debug("Pre-test sanity check results:\n%s" % json.dumps(check_results, indent=4, default=fallback_serializer))
2022-06-07T14:03:18.3719142Z     
2022-06-07T14:03:18.3720153Z             failed_results = [result for result in check_results if result['failed']]
2022-06-07T14:03:18.3720896Z             if failed_results:
2022-06-07T14:03:18.3721445Z                 if not allow_recover:
2022-06-07T14:03:18.3722705Z                     pt_assert(False, "!!!!!!!!!!!!!!!!Pre-test sanity check failed: !!!!!!!!!!!!!!!!\n{}"\
2022-06-07T14:03:18.3723743Z                         .format(json.dumps(failed_results, indent=4, default=fallback_serializer)))
2022-06-07T14:03:18.3724477Z                 else:
2022-06-07T14:03:18.3725020Z                     dut_failed_results = defaultdict(list)
2022-06-07T14:03:18.3725684Z                     infra_recovery_actions= []
2022-06-07T14:03:18.3726291Z                     for failed_result in failed_results:
2022-06-07T14:03:18.3727294Z                         if 'host' in failed_result:
2022-06-07T14:03:18.3728553Z                             dut_failed_results[failed_result['host']].append(failed_result)
2022-06-07T14:03:18.3729813Z                         if failed_result['check_item'] in constants.INFRA_CHECK_ITEMS:
2022-06-07T14:03:18.3731140Z                             if 'action' in failed_result and failed_result['action'] is not None \
2022-06-07T14:03:18.3732291Z                                 and callable(failed_result['action']):
2022-06-07T14:03:18.3733425Z                                 infra_recovery_actions.append(failed_result['action'])
2022-06-07T14:03:18.3734235Z                     for dut_name, dut_results in dut_failed_results.items():
2022-06-07T14:03:18.3734958Z                         # Attempt to restore DUT state
2022-06-07T14:03:18.3736305Z                         recover(duthosts[dut_name], localhost, fanouthosts, dut_results, recover_method)
2022-06-07T14:03:18.3737169Z                         # Attempt to restore neighbor VM state
2022-06-07T14:03:18.3737906Z                         neighbor_vm_restore(duthosts[dut_name], nbrhosts, tbinfo)
2022-06-07T14:03:18.3738637Z                     for action in infra_recovery_actions:
2022-06-07T14:03:18.3739490Z                         action()
2022-06-07T14:03:18.3739897Z     
2022-06-07T14:03:18.3740483Z                     logger.info("Run sanity check again after recovery")
2022-06-07T14:03:18.3741411Z                     new_check_results = do_checks(request, pre_check_items, stage=STAGE_PRE_TEST, after_recovery=True)
2022-06-07T14:03:18.3743321Z                     logger.debug("Pre-test sanity check after recovery results:\n%s" % json.dumps(new_check_results, indent=4, default=fallback_serializer))
2022-06-07T14:03:18.3744215Z     
2022-06-07T14:03:18.3745309Z                     new_failed_results = [result for result in new_check_results if result['failed']]
2022-06-07T14:03:18.3746080Z                     if new_failed_results:
2022-06-07T14:03:18.3747335Z                         pt_assert(False, "!!!!!!!!!!!!!!!! Pre-test sanity check after recovery failed: !!!!!!!!!!!!!!!!\n{}"\
2022-06-07T14:03:18.3748388Z >                           .format(json.dumps(new_failed_results, indent=4, default=fallback_serializer)))
2022-06-07T14:03:18.3750323Z E                       Failed: !!!!!!!!!!!!!!!! Pre-test sanity check after recovery failed: !!!!!!!!!!!!!!!!
2022-06-07T14:03:18.3751190Z E                       [
2022-06-07T14:03:18.3751643Z E                           {
2022-06-07T14:03:18.3752204Z E                               "check_item": "interfaces", 
2022-06-07T14:03:18.3752789Z E                               "failed": true, 
2022-06-07T14:03:18.3753884Z E                               "host": "vlab-02", 
2022-06-07T14:03:18.3754431Z E                               "down_ports": [
2022-06-07T14:03:18.3755034Z E                                   "PortChannel101", 
2022-06-07T14:03:18.3755570Z E                                   "PortChannel102"
2022-06-07T14:03:18.3756083Z E                               ]
2022-06-07T14:03:18.3756510Z E                           }, 
2022-06-07T14:03:18.3756963Z E                           {
2022-06-07T14:03:18.3757476Z E                               "check_item": "bgp", 
2022-06-07T14:03:18.3758052Z E                               "failed": true, 
2022-06-07T14:03:18.3758942Z E                               "host": "vlab-02", 
2022-06-07T14:03:18.3759490Z E                               "bgp": {
2022-06-07T14:03:18.3759989Z E                                   "down_neighbors": [
2022-06-07T14:03:18.3760563Z E                                       "fc00::2", 
2022-06-07T14:03:18.3761254Z E                                       "10.0.0.5", 
2022-06-07T14:03:18.3761883Z E                                       "10.0.0.1", 
2022-06-07T14:03:18.3762462Z E                                       "fc00::a"
2022-06-07T14:03:18.3763056Z E                                   ]
2022-06-07T14:03:18.3763494Z E                               }
2022-06-07T14:03:18.3764013Z E                           }
2022-06-07T14:03:18.3764450Z E                       ]
2022-06-07T14:03:18.3764645Z 
2022-06-07T14:03:18.3765150Z allow_recover = True
2022-06-07T14:03:18.3767285Z check_results = [{'check_item': 'processes', 'failed': False, 'host': 'vlab-02', 'processes_status': {'bgp': {'exited_critical_process...atus ok', 'diskCheck': 'Status ok', 'root-overlay': 'Accessible', ...}}, {'check_item': 'secureboot', 'failed': False}]
2022-06-07T14:03:18.3768779Z cli_check_items = False
2022-06-07T14:03:18.3769399Z cli_post_check_items = False
2022-06-07T14:03:18.3770046Z customized_sanity_check = None
2022-06-07T14:03:18.3770580Z dual_tor   = False
2022-06-07T14:03:18.3772313Z dut_failed_results = defaultdict(<type 'list'>, {'vlab-02': [{'check_item': 'interfaces', 'failed':...gp': {'down_neighbors': [u'fc00::2', u'10.0.0.5', u'10.0.0.1', u'fc00::a']}}]})
2022-06-07T14:03:18.3774316Z dut_name   = 'vlab-02'
2022-06-07T14:03:18.3776375Z dut_results = [{'check_item': 'interfaces', 'down_ports': ['PortChannel101', 'PortChannel102'], 'failed': True, 'host': 'vlab-02'}, ...n_neighbors': ['fc00::2', '10.0.0.5', '10.0.0.1', 'fc00::a']}, 'check_item': 'bgp', 'failed': True, 'host': 'vlab-02'}]
2022-06-07T14:03:18.3778418Z duthosts   = [<MultiAsicSonicHost vlab-02>]
2022-06-07T14:03:18.3779946Z failed_result = {'bgp': {'down_neighbors': ['fc00::2', '10.0.0.5', '10.0.0.1', 'fc00::a']}, 'check_item': 'bgp', 'failed': True, 'host': 'vlab-02'}
2022-06-07T14:03:18.3782437Z failed_results = [{'check_item': 'interfaces', 'down_ports': ['PortChannel101', 'PortChannel102'], 'failed': True, 'host': 'vlab-02'}, ...n_neighbors': ['fc00::2', '10.0.0.5', '10.0.0.1', 'fc00::a']}, 'check_item': 'bgp', 'failed': True, 'host': 'vlab-02'}]
2022-06-07T14:03:18.3783924Z fanouthosts = {}
2022-06-07T14:03:18.3784440Z infra_recovery_actions = []
2022-06-07T14:03:18.3785350Z item       = 'check_secureboot'
2022-06-07T14:03:18.3786057Z localhost  = <tests.common.devices.local.Localhost object at 0x7f4bb9d07990>
2022-06-07T14:03:18.3787256Z m          = Mark(name='device_type', args=('vs',), kwargs={})
2022-06-07T14:03:18.3789145Z nbrhosts   = {'ARISTA01T1': <SonicHost VM0100>, 'ARISTA02T1': <SonicHost VM0101>, 'ARISTA03T1': <SonicHost VM0102>, 'ARISTA04T1': <SonicHost VM0103>}
2022-06-07T14:03:18.3792117Z new_check_results = [{'check_item': 'processes', 'failed': False, 'host': 'vlab-02', 'processes_status': {'bgp': {'exited_critical_process...atus ok', 'diskCheck': 'Status ok', 'root-overlay': 'Accessible', ...}}, {'check_item': 'secureboot', 'failed': False}]
2022-06-07T14:03:18.3795174Z new_failed_results = [{'check_item': 'interfaces', 'down_ports': ['PortChannel101', 'PortChannel102'], 'failed': True, 'host': 'vlab-02'}, ...n_neighbors': ['fc00::2', '10.0.0.5', '10.0.0.1', 'fc00::a']}, 'check_item': 'bgp', 'failed': True, 'host': 'vlab-02'}]
2022-06-07T14:03:18.3796641Z post_check = False
2022-06-07T14:03:18.3797138Z post_check_items = set([])
2022-06-07T14:03:18.3798405Z pre_check_items = ['check_processes', 'check_interfaces', 'check_bgp', 'check_dbmemory', 'check_monit', 'check_secureboot']
2022-06-07T14:03:18.3799955Z pre_post_check_items = ['check_processes', 'check_interfaces', 'check_bgp', 'check_dbmemory', 'check_monit', 'check_secureboot']
2022-06-07T14:03:18.3801069Z recover_method = 'adaptive'
2022-06-07T14:03:18.3802090Z request    = <SubRequest 'sanity_check' for <Function test_bgp_facts[128-vlab-02-None]>>
2022-06-07T14:03:18.3811422Z result     = {'check_item': 'secureboot', 'failed': False}
2022-06-07T14:03:18.3812024Z skip_sanity = False
2022-06-07T14:03:18.3813222Z tbinfo     = {'auto_recover': 'False', 'comment': 'Tests virtual switch vm', 'conf-name': 'vms-kvm-t0-64-32', 'duts': ['vlab-02'], ...}
2022-06-07T14:03:18.3813755Z 
2022-06-07T14:03:18.3814245Z common/plugins/sanity_check/__init__.py:237: Failed
2022-06-07T14:03:18.3815368Z - generated xml file: /data/sonic-mgmt/tests/logs/t0-sonic/bgp/test_bgp_fact.xml -
2022-06-07T14:03:18.3816288Z =========================== short test summary info ============================
2022-06-07T14:03:18.3817664Z ERROR bgp/test_bgp_fact.py::test_bgp_facts[128-vlab-02-None] - Failed: !!!!!!...
2022-06-07T14:03:18.3818585Z ========================== 1 error in 746.09 seconds ===========================

@qiluo-msft qiluo-msft requested a review from wen587 June 20, 2022 06:20
@wen587
Copy link
Contributor

wen587 commented Jun 21, 2022

Hi, I think this change will break show runningconfiguration syslog
https://github.com/Azure/sonic-utilities/blob/master/show/main.py#L1547-L1578
May need update in sonic-utilities.

@nazariig
Copy link
Collaborator Author

nazariig commented Jul 5, 2022

Hi, I think this change will break show runningconfiguration syslog https://github.com/Azure/sonic-utilities/blob/master/show/main.py#L1547-L1578 May need update in sonic-utilities.

@wen587 fixed

@nazariig
Copy link
Collaborator Author

The PR has a circular dependency on a sonic-utilities submodule update, hence need to be merged first

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
@liat-grozovik
Copy link
Collaborator

@nazariig why the submodule update is part of code changes on buildimage?
the description is not aligned same goes for the labels.
please clarify what exactly is expected to be included in this PR

@nazariig
Copy link
Collaborator Author

nazariig commented Jul 18, 2022

@nazariig why the submodule update is part of code changes on buildimage? the description is not aligned same goes for the labels. please clarify what exactly is expected to be included in this PR

@liat-grozovik @qiluo-msft asked to incorporate submodule update into this PR to avoid circular dependency

@nazariig
Copy link
Collaborator Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@nazariig
Copy link
Collaborator Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nazariig
Copy link
Collaborator Author

Contains changes from: #11468

@nazariig
Copy link
Collaborator Author

@qiluo-msft can you please merge this one?

@liat-grozovik liat-grozovik merged commit e4e3adc into sonic-net:master Jul 20, 2022
lolyu pushed a commit to lolyu/sonic-mgmt that referenced this pull request Dec 19, 2022
In PR: https://dev.azure.com/mssonic/internal/_git/sonic-mgmt-int/pullrequest/1151,  we patched rsyslog to send out rsyslog message to lab server and ingests to Kusto. With the SONiC version information, we can query syslog of lab DUTs in Kusto by its version information.

However, master image has added template="SONiCFileFormat" in PR: sonic-net/sonic-buildimage#10991, which caused issue: https://msazure.visualstudio.com/One/_workitems/edit/15990217

To solve this issue, in master image pipeline, we replace template=.*SONiCFileFormat with template=RemoteSONiCFileFormat; in internal image pipeline, we add template=RemoteSONiCFileFormat to action omfwd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants