Skip to content

[pull] master from Azure:master#1607

Merged
pull[bot] merged 2 commits intomudsut4ke:masterfrom
sonic-net:master
Jun 16, 2021
Merged

[pull] master from Azure:master#1607
pull[bot] merged 2 commits intomudsut4ke:masterfrom
sonic-net:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Jun 16, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

liushilongbuaa and others added 2 commits June 15, 2021 16:38
There is no rule to build swi target. The correct target is *.bin.
#7840)

#### Why I did it
The PR checkers do not re-run the sonic-config-engine test cases, caused by some of the config files changes not detected.

https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/660/console
…
07:13:24  ======================================================================
07:13:24  ERROR: test_bgpd_quagga (tests.test_j2files.TestJ2Files)
07:13:24  ----------------------------------------------------------------------
…
07:13:24  ======================================================================
07:13:24  ERROR: test_zebra_quagga (tests.test_j2files.TestJ2Files)
07:13:24  ----------------------------------------------------------------------
…
07:13:24  error: Test failed: <unittest.runner.TextTestResult run=161 errors=2 failures=0>
07:13:24  [  FAIL LOG END  ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ]
07:13:24  make: *** [slave.mk:603: target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl] Error 1
07:13:24  Makefile.work:292: recipe for target 'target/sonic-mellanox.bin' failed
07:13:24  make[1]: *** [target/sonic-mellanox.bin] Error 2
07:13:24  make[1]: Leaving directory '/data2/johnar/workspace/mellanox/buildimage-mlnx-all'
07:13:24  Makefile:7: recipe for target 'target/sonic-mellanox.bin' failed
07:13:24  make: *** [target/sonic-mellanox.bin] Error 2

See PR: #7476


#### How I did it
Add the depended files.
See src/sonic-config-engine/tests/test_j2files.py
@pull pull bot added the ⤵️ pull label Jun 16, 2021
@pull pull bot merged commit f6098c8 into mudsut4ke:master Jun 16, 2021
mudsut4ke pushed a commit that referenced this pull request Jul 19, 2021
- swss:
* 459d09b 2021-02-22 | [acl] Enable VLAN ID qualifier for ACL rules (#1648) (HEAD -> 202012) [Danny Allen]
* 60859b1 2021-02-08 | [buffermgr] Support maximum port headroom checking (#1607) [Stephen Sun]
* 3161cbb 2021-02-17 | Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (#1600) [Andriy Yurkiv]
* 256ed9c 2021-02-08 | Support shared headroom pool on top of dynamic buffer calculation (#1581) [Stephen Sun]

- utilities:
* 30d7069 2021-02-16 | [decode-syseeprom] Refactor to utilize sonic-platform package (#1435) (HEAD -> 202012, tag: foo) [Joe LeVeque]
* 891fef4 2021-02-16 | [psuutil] Refactor to utilize sonic-platform package (#1434) [Joe LeVeque]
* 8c5e505 2021-02-17 | [sfputil] Refactor to utilize sonic-platform package (#1421) [Joe LeVeque]
* ca5dd2c 2021-02-17 | [sfpshow] Cleanup (#1405) [Joe LeVeque]
* bf489ea 2021-02-17 | Add new cli for SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter in counterpoll utility (#1355) [Andriy Yurkiv]
* 25feed3 2021-02-08 | Support shared headroom pool on top of dynamic buffer calculation (#1348) [Stephen Sun]
* aaa323a 2021-02-02 | [vrf]: Fix freezing during interface binding (#1325) [maksymbelei95]
* cc0bb6e 2021-01-27 | [show] fix "show interfaces breakout" command (#1198) [Dmytro Shevchuk]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
mudsut4ke pushed a commit that referenced this pull request Jul 19, 2021
utilities:
* 83f068b 2021-03-22 | Handling error scenario of adding port to Vlan which is part of LAG (#1516) (HEAD -> 202012) [Sudharsan Dhamal Gopalarathnam]
* 470e8ce 2021-03-24 | Enable PFCWD only on ports where PFC is enabled (#1508) [Andriy Yurkiv]
* 09ef2e0 2021-03-22 | [show][config] add support for setting and displaying switching modes on Y cable (#1501) [vdahiya12]
* 0d17d37 2021-03-24 | Warmboot script improvements - timeout exec, disable swss autorestart, remove trap (#1495) [Vaibhav Hemant Dixit]
* 2718cd8 2021-03-24 | [show] Fix int status of LAGs, configured as Vlan members (#1478) [maksymbelei95]
* cc168fb 2021-03-22 | Fix bug: show vlan config for vlan with no members (#1503) [allas-nvidia]

swss:
* 5d8d1fb 2021-03-26 | Revert "Revert "[buffermgr] Support maximum port headroom checking (#1607)" (#1675)" (#1682) (HEAD -> 202012) [Prince Sunny]
* f8df1f8 2021-03-26 | [Dynamic Buffer Calc] Enhance the field checking in table handling (#1680) [Stephen Sun]
* 6328c9f 2021-03-22 | [MuxOrch] FDB ageout safety check (#1674) [Prince Sunny]
* e1d733e 2021-03-21 | reduce severity of log to info in case of flush on non-existing member (#1669) [allas-nvidia]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
pariwat pushed a commit to pariwat/sonic-buildimage that referenced this pull request Sep 10, 2021
Update sonic-sairedis submodule and also update sonic-swss submodule as there are interdependent changes.

* src/sonic-sairedis 13474d1...bc58b0f (12):
  > Add gbsyncdmgrd; deprecate gbsyncd_startup.py (mudsut4ke#809)
  > Remove gbsyncd_start.sh (mudsut4ke#808)
  > [gbsyncd] Fix shebang in gbsyncd_startup.py; Make script executable (mudsut4ke#807)
  > [saiasiccmp] Add saiasiccmp tool to compare 2 asic views (mudsut4ke#791)
  > [configure] Add -Wno-psabi to remove "passing argument changed in GCC 7.1" (mudsut4ke#799)
  > Update FlexCounter.cpp, use m_pollInterval in MUTEX lock (mudsut4ke#797)
  > [vs] Add special warm boot logic to populate default attributes (mudsut4ke#796)
  > [ci]: add vstest (mudsut4ke#795)
  > [tests] Add macsec unittest (mudsut4ke#782)
  > [debian/control] libsairedis-dev depends on libzmq5-dev (mudsut4ke#794)
  > [ci]: use build template (mudsut4ke#793)
  > Rename duplicate file name (mudsut4ke#773)

* src/sonic-swss 0b0d24c...5adb73e (47):
  > Initialize system port type variable (mudsut4ke#1681)
  > [Dynamic Buffer Calc] Enhance the field checking in table handling (mudsut4ke#1680)
  > Handle the clear request for 'Q_SHARED_ALL' (mudsut4ke#1653)
  > [MuxOrch] FDB ageout safety check (mudsut4ke#1674)
  > Deactivate mirror session only when session status is true in updateLagMember (mudsut4ke#1666)
  > Revert "[buffermgr] Support maximum port headroom checking (mudsut4ke#1607)" (mudsut4ke#1675)
  > reduce severity of log to info in case of flush on non-existing member (mudsut4ke#1669)
  > Revert "[Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (mudsut4ke#1652)" (mudsut4ke#1676)
  > [Dynamic buffer calc] Bug fix: Remove PGs from an administratively down port. (mudsut4ke#1652)
  > [acl] Move ACL table constants to acltable.h (mudsut4ke#1671)
  > [nbrmgrd] added function to parse IP address from APP_DB (mudsut4ke#1672)
  > [MUX/PFCWD] Use in_ports for acls instead of seperate ACL table (mudsut4ke#1670)
  > [vog/systemlag] Voq lagid allocator (mudsut4ke#1603)
  > Add table descriptions for dynamic buffer calculation to the documents (mudsut4ke#1664)
  > [vstest/subintf] Add vs test case to validate processing sequence of APPL DB keys (mudsut4ke#1663)
  > Remove vxlanmgrd dependency on orchagent (mudsut4ke#1647)
  > Keep attribute order in bulk mode (mudsut4ke#1659)
  > [mux] VS test for neigh, route and fdb (mudsut4ke#1656)
  > [linksync] Netdev oper status determination using IFF_RUNNING (mudsut4ke#1568)
  > [portorch] parse on/off value from autoneg (mudsut4ke#1658)
  > [intfsorch] Create subport with the entry contains necessary attributes (mudsut4ke#1650)
  > [ci]: Purge swss before install (mudsut4ke#1654)
  > Update StateDB with error if state change failed, Update APP_DB in all state chg req (mudsut4ke#1662)
  > Added changes to handle dependency check in FdbSyncd and FpmSyncd for warm-boot (mudsut4ke#1556)
  > [synchronous mode] Add failure notification for SAI failures in synchronous mode (mudsut4ke#1596)
  > [acl] Enable VLAN ID qualifier for ACL rules (mudsut4ke#1648)
  > Updated PFCWD to use single ACL table for PFCWD and MUX (mudsut4ke#1620)
  > [orchagent] Increase SAI REDIS response timeout to support FW upgrade during init (Mellanox only). (mudsut4ke#1637)
  > [vstest/nhg]: use dvs_route fixture to make test_nhg more robust
  > [vstest]: add dvs_route fixture
  > [vstest/subintf] Update vs tests to validate physical port host interface vlan tag attribute (mudsut4ke#1634)
  > Remove useless header  in macsecorch (mudsut4ke#1628)
  > Add SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS counter, create new FlexCounter group (mudsut4ke#1600)
  > fixed unsupported resource issue (mudsut4ke#1641)
  > [test_virtual_chassis]: use wait_for to make test more robust (mudsut4ke#1640)
  > spell check fixes (mudsut4ke#1630)
  > [bufferorch] Handle NOT IMPLEMENTED status returned during set attr operation (mudsut4ke#1639)
  > [ci]: run vstest
  > [test_virtual_chassis]: use wait_for function to improve test robustness
  > [Mux] Neighbor handling based on FDB entry (mudsut4ke#1631)
  > [ci]: use build template (mudsut4ke#1633)
  > Log level change from ERR to INFO for fetch systemports issue (mudsut4ke#1632)
  > Migrate serdes programming to port serdes object (mudsut4ke#1611)
  > [tests] Remove legacy saiattributelist.h dependency (mudsut4ke#1608)
  > [buffermgr] Support maximum port headroom checking (mudsut4ke#1607)
  > Support shared headroom pool on top of dynamic buffer calculation (mudsut4ke#1581)
  > Fix the compiling errors in gcc9 (mudsut4ke#1621)
pariwat pushed a commit to pariwat/sonic-buildimage that referenced this pull request Sep 10, 2021
[SFlowMgr] Sflow Crash on 200G ports handled (mudsut4ke#1683)
Remove PGs from an administratively down port. (mudsut4ke#1677)
Stablize the test case (mudsut4ke#1679)
Revert "Revert "[buffermgr] Support maximum port headroom checking (mudsut4ke#1607)" (mudsut4ke#1675)" (mudsut4ke#1682)

Signed-off-by: Stephen Sun <stephens@nvidia.com>
pariwat pushed a commit to pariwat/sonic-buildimage that referenced this pull request Sep 10, 2021
Include fullowing changes:

* 9fc630c 2021-05-11 | [sonic_installer] temporary fix: don't migrate packages on aboot platforms (mudsut4ke#1607) (github/master) [Stepan Blyshchak]
* fde1d95 2021-05-11 | [config][vxlan] fix 'vxlan evpn_nvo add' command error (mudsut4ke#1511) [shikenghua]
* 331c5a5 2021-05-10 | [config]: Use mod_entry when editing VLAN_INTERFACE (mudsut4ke#1602) [Lawrence Lee]
* 8c2980a 2021-05-08 | [sonic-utilities] CLI support for port auto negotiation (mudsut4ke#1568) [Junchao-Mellanox]
* a71ff02 2021-05-06 | [sfpshow] Gracefully handle improper 'specification_compliance' field (mudsut4ke#1594) [Joe LeVeque]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
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.

2 participants