-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
[Makefile] Allowing interactive session with the slave docker-container #903
Conversation
* Adjusting FRR's jinja template to meet latest sonic-cfgen requirements. Basically, i'm just extending sonic-net#448 changes into FRR. * Eliminate FRR's integrated-config file to prevent daemons from bypassing their own config files. FRR daemons now default to an integrated-config file for config-parsing purposes. But we are still interested in having each daemon looking in their specific config file (bgpd.conf, zebra.conf, etc). So here i'm just deleting this integrating-config file to prevent FRR from running from a bogus config-file. RB= G=lnos-reviewers R=ntrianta,rjonnadu,rmolina,sfardeen,zxu A=
Sync-up msft and fork
…lusion of the building process. Proposed changes provide a more direct access to the building pipeline, by allowing users to launch consecutive compilation tasks from the same slave container.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the use-case for this? If you need to go to sonic-slave container, you can simply execute make sonic-slave-bash
@marian-pritsak I want the container to stay up and running so when I recompile, my compilation is faster. I also want to keep the original container up and have its filesystem mounted at a certain mount point in the local fs. This change provides me with greater flexibility and is non-intrusive since it's optional. What is your concern over this change? |
@Nikos-Li, I'm not saying that it will break anything, but I just don't get the benefit of that. If you just want to stay inside slave container, there's |
@marian-pritsak make sonic-slave-bash won't work in quite the same way. If I exit from it, the information will be lost again, no? The intend is to keep the container (not through make sonic-slave-bash) and (with additional private changes) to have that container's filesystem mounted through sshfs. |
Ok, now I see. It's a bit complicated scenario, but I'm ok with it. |
* Update src/sonic-swss from branch 'broadcom_sonic' to cd2a2e0504412254d4d44f5f97946921dc246cc6 - Merge 201904 branch to broadcom_sonic branch on Mon Jul 1 13:57:57 PDT 2019 Change-Id: I77bef1ba390171f204e27387bee0226ddab38971 - [debian]: Do not build test when building with real SAI (sonic-net#932) - swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (sonic-net#907) * Vnet route persistence Signed-off-by: weixi.chen@microsoft.com - pkill -9 zebra for frr warm restart VS test fix (sonic-net#927) Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> - [vnetorch]: Fix tunnel route removal flow for bitmap VNET (sonic-net#912) Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> - [orchagent]: Added support of PFC WD for BFN platform (sonic-net#823) * [orchagent]: Added support of PFC WD for BFN platform Signed-off-by: Vitaliy Senchyshyn <vsenchyshyn@barefootnetworks.com> * Fixed review comments Signed-off-by: Vitaliy Senchyshyn <vsenchyshyn@barefootnetworks.com> * Use PFC WD ACL handler for BFN platform - [aclorch] unittest by gtest (sonic-net#924) - [orchagent]: Remove try/catch for correct coredump file (sonic-net#790) Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> - Set LAG mtu value based on kernel netlink msg (sonic-net#922) * Update mtu value based on kernel netlink msg * Push the calculated MTU size into the fvVector - Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (sonic-net#839) Signed-off-by: Wenda Ni <wenni@microsoft.com> - [vxlanorch] Ambiguous return code for removeNextHopTunnel (sonic-net#880) Change to return false when isTunnelExists is fail - [vnet]: Extend Bitmap VNET test with "remove" flows (sonic-net#900) Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> - add dynamic transceiver tuning support (sonic-net#821) - Remove *_LEFT fields to allow PFC watchdog to enter fresh into the (sonic-net#897) operational/storm state Signed-off-by: Wenda Ni <wenni@microsoft.com> - Fix vlan incremental config and add vs test cases (sonic-net#799) * Fix vlan incremental config and add vs test cases Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> - Suppress storm detect counter increment for ongoing pfc storm case during a warm reboot (sonic-net#869) * Suppress storm detect counter increment for ongoing pfc storm case during a warm reboot Signed-off-by: Wenda Ni <wenni@microsoft.com> * Comment touch-up Signed-off-by: Wenda Ni <wenni@microsoft.com> - [warm restart assist] assume vector values could be reordered (sonic-net#921) When comparing 2 vectors, assume their elements could be re-ordered. Signed-off-by: Ying Xie <ying.xie@microsoft.com> - [test]: Mark some VLAN tests as Stretch only (sonic-net#903) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com> - [aclorch]: Add MIRROR_DSCP table type (sonic-net#906) Add MIRROR_DSCP table to support creating an ACL mirro table that only matches DSCP value/mask. Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com> - [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#911) From debhelper man pages: "If neither option is specified, debhelper currently defaults to --parallel in compat 10 (or later) and --no-parallel otherwise." Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> - [test]: Skip tests under investigation (sonic-net#919) - [vstest]: Update the mirror session state table name (sonic-net#917) Due to the change c033b23 Fix MIRROR_SESSION table macro name (sonic-net#802) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com> - Ignore neighbor entry with BCAST MAC, check SAI status exists (sonic-net#914) * Ignore neighbor entry with BCAST MAC, check SAI status exists * Addressed review comment - Fix MIRROR_SESSION table macro name (sonic-net#802) Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> - [policerorch]: Add PolicerOrch to bundle with mirror session (sonic-net#889) Now that we could create a policer for the mirror session to throttle the mirroring traffic. configuration: POLICER|NAME: meter_type:packets|bytes mode:sr_tcm|tr_tcm|storm_control cir|DIGITS cbs|DIGITS pir|DIGITS pbs|DIGITS corlor_source:aware|blind red_action:drop yellow_action:drop green_action:drop MIRROR_SESSION|NAME: policer:policer_name Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
* msft_github/master: [snmpagent]: Update sonic-snmpagent submodule (sonic-net#1004) [swss]: Update the ipinip.j2 template to specify the IPv4 loopback address (sonic-net#998) Change all port_config.ini column headers from 'port' to 'index' (sonic-net#1001) [docker-platform-monitor]: Remove stale fancontrol.pid file (if exists) before starting fancontrol (sonic-net#1002) [swss]: Update swss/common submodules (sonic-net#988) [snmp]: Update py-swsssdk/snmpagent submodules (sonic-net#996) [Broadcom]: Update SAI version to 3.0.3.2-5 (sonic-net#997) [Mellanox]: Update outdated MSN2410 minigraph (sonic-net#995) Add time stamp suffix to the dirty images version string (sonic-net#958) [Mellanox]: Remove FW upgrade procedure in docker (sonic-net#989) [snmp]: Update sonic-snmpagent submodule (sonic-net#986) [Broadcom]: Update SAI version to 3.0.3.2-4 (sonic-net#983) [Ingrasys]: Add Ingrasys S8900-64XC sfputil function and update submodule (sonic-net#984) [mellanox]: Update Mellanox SAI version (sonic-net#979) [Ingrasys]: Change hwmon kernel modules installation order (sonic-net#980) [Makefile] Allowing interactive session with the slave docker-container (sonic-net#903) [snmp]: Update sonic-snmpagent submodule (sonic-net#978) Disable snmpd module disk_hw, so no syslog messages about unavailable disks (sonic-net#977) [teamd]: Remove deprecated blocking logic before starting teamd (sonic-net#976) [Broadcom]: Update libsai version to 3.0.3.2-2 (sonic-net#973) [device/accton]: Add a new supported device, AS7312-54X (sonic-net#955) [sairedis]: update sairedis submodule (sonic-net#974) lacp runner will send lacp update right after it received SIGINT (sonic-net#969) [config]: Fix management interface configuration (sonic-net#966) [Broadcom]: Update OpenNSL modules (sonic-net#970) [utilities]: Update sonic-utilities (sonic-net#968) [interfaces]: Change MTU value to 9100 (sonic-net#967) Framework to plugin Organization specific scripts during ONIE Image build (sonic-net#951) Always start with Forwarding State flag set for bgpd (sonic-net#963) Update sonic-utilities to be compatible with sonic-net#942 (sonic-net#965) [swss]: Fix the command to get HWSKU with sonic-cfggen (sonic-net#964) [bgp]: Fix the deployment_id with DEVICE_METADATA (sonic-net#962) [Ingrasys] Update Ingrasys submodule for S8900-54XC (sonic-net#954) [build/onie installer] Install grub for SONiC post migration from another NOS (sonic-net#949) [syncd]: Comment out unused docker-ptf-brcm.mk [Broadcom]: Update OpenNSL/SAI version (sonic-net#959) [swss]: Move swss/common/sairedis submodule to 201709 tag [sairedis]: update sairedis submodule head (sonic-net#956) [service template] Starting new docker when HWSKU change is detected (sonic-net#946) [config] Fix an issue that bgp asn data type is not consistent (sonic-net#953) [mellanox]: Update Mellanox SAI version ansd SDK version [Ingrasys] update port_config.ini and sfputil for ingrasys platforms (sonic-net#952) [frr]: RR client support in minigraph for FRR (sonic-net#923) [configdb] Migrate minigraph configurations to DB (sonic-net#942) [devices]: Add led plugin for Arista 7060CX-32S and 7260CX3-64 (sonic-net#945) [sonic-slave]: SLAVE_TAG should be for both Dockerfile and Dockerfile.user (sonic-net#950) [github]: add templates for submitting issues and PR (sonic-net#947) [rsyslog]: Use timegenerated instead of timestamp (sonic-net#944) [dell]: remove nos_to_sonic_grub.cfg (sonic-net#943) [slave.mk]: Apply series of patches to SONIC_PYTHON_STDEB_DEBS targets if they exist (sonic-net#941) [rsyslog]: Use SONiC template in containers (sonic-net#940) [Broadcom]: Remove BRCM_OPENNSL library and upgrade BRCM_SAI to 3.0.3.2 (sonic-net#938) [baseimage]: allocate varlog disk in the initramfs stage (sonic-net#936) [sairedis]: revert deadlock fix in sonic-sairedis submodule (sonic-net#934) Replace CRLF line endings with LF (sonic-net#932) Fix confusing comment (sonic-net#931) Update sfputil support for Ingrasys S9100 (sonic-net#929) [quagga]: Disable ipv4 over ipv6 and enable ipv6 over ipv4 peer group (sonic-net#922) [quagga] enable core dump for bgpd and zebra (sonic-net#927) [devices]: Update Dell s6100/z9100 platform modules (sonic-net#925) Revert "Migrate DEVICE_METADATA to db (sonic-net#919)" (sonic-net#928) Migrate DEVICE_METADATA to db (sonic-net#919) [devices]: Bump sonic-platform-modules-arista submodule (sonic-net#924) [image]: build sonic-broadcom.raw image for sonic conversion from ftos (sonic-net#901) [sonic-slave] Force pyangbind version to 0.5.10 (sonic-net#918) [Arista-7260CX3] Rename hwSKU Arista-7260CX3-64 to Arista-7260CX3-C64, introducing new hwSKU Arista-7260CX3-D108C8 (sonic-net#920) [devices]: modify sfputil plugins for mellanox devices for new platform API (sonic-net#916) [cavm]Update sai revision and packet driver (sonic-net#914) [translate-acl] Specify pyangbind version to not introduce new dependency (sonic-net#915) Update sfputil support for Arista platforms (sonic-net#912) Port speed (sonic-net#879) [Accton]: Add a new supported device AS5712-54X (sonic-net#898) [kernel]: update kernel submodule (sonic-net#910) [device]: Updated dell s6100 submodule to 5ab014 (sonic-net#909) [broadcom]: update broadcom sai package to 2.1.5.1-17 (sonic-net#908) IPv4 prefixes shouldn't be sent by default over IPv6 session with FRR. (sonic-net#905) [submodule]: update sonic linux kernel (sonic-net#906) [sonic-sairedis] update sairedis submodule (sonic-net#211, sonic-net#212) (sonic-net#904) [mlnx-fw-upgrade]: Define required FW version in build time. (sonic-net#902) [SAI]: Remove the SAI submodule from buildimage repo (sonic-net#893) [Submodule update]: sonic-utilities (sonic-net#888) Revert "[mellanox]: Update Mellanox SAI version" [mellanox]: Update Mellanox SAI version [utilities]: Update sonic-utilities submodule [swss-common]: Update sonic-swss-common submodule [mellanox]: Disable fsat boot mode for SX kernel [quagga]: Update sonic-quagga submodule [Broadcom]: Update Broadcom SAI/SDK version (sonic-net#883) Squash merge v1.0.3 branch onto master
Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
Fix is_mgmt_vrf_enabled when MGMT_VRF_CONFIG is not present the config (sonic-net#885) Changes to support acl-loader command for multi-npu platforms. (sonic-net#908) Stop/Start restapi server upon config reload (sonic-net#911) [fanshow] Add column drawer name and led status to output of show platform(sonic-net#991) [MultiDB] use sonic-db-cli instead of redis-cli in new added codes (sonic-net#907) [show] Add `ntpstat` output to `show ntp` (sonic-net#861) [config] Log invocation of config commands to syslog (sonic-net#259) Remove dependency on click-default-group package (sonic-net#903) [config] Add 'interface transceiver' subgroup with 'lpmode' and 'rese…' (sonic-net#904) [show] Add 'errors' and 'rates' subcommands to 'show interfaces count…(sonic-net#900) [config] Support load_minigraph command for multi NPU platform (sonic-net#896) [Vnet] Fix NameError for 'swsssdk' and align output (sonic-net#902)
Fix is_mgmt_vrf_enabled when MGMT_VRF_CONFIG is not present the config (#885) Changes to support acl-loader command for multi-npu platforms. (#908) Stop/Start restapi server upon config reload (#911) [fanshow] Add column drawer name and led status to output of show platform(#991) [MultiDB] use sonic-db-cli instead of redis-cli in new added codes (#907) [show] Add `ntpstat` output to `show ntp` (#861) [config] Log invocation of config commands to syslog (#259) Remove dependency on click-default-group package (#903) [config] Add 'interface transceiver' subgroup with 'lpmode' and 'rese…' (#904) [show] Add 'errors' and 'rates' subcommands to 'show interfaces count…(#900) [config] Support load_minigraph command for multi NPU platform (#896) [Vnet] Fix NameError for 'swsssdk' and align output (#902)
Update the sonic-sairedis submodule. The following is a list of new commits in the submodule. f85322e Advance SAI submodule (#911) 66c1a3d [syncd] Check warm vids right after discover (#907) 1020de7 Change the log severity leve from ERROR to NOTICE if getStatus is not supported by vendor (#908) 5349a9d Add support for BFD notification (#903) 6ff9100 [MACsec]: Fix Bug: MACsec device will be terminated exceptionally if the MACsec port was disabled in runtime (#875) b91f75f [sairedis] Add warning on double switch id allocation 518b93a [tests] Adapt tests to armhf arch 36106e9 [vslib] Unify bulkCreate for entries with perf timer 88cf0f7 [vslib] Remove dead code f282690 Simplify declare every entry macro reuse b28e5e3 [tests] Add missing memory header 980bba4 Add missing pyext in makefile 00ffa62 Update aspell 4a5d3b5 Add SwitchBCM81724 tests 8a7b712 Remove dead code from SwitchBCM81724 71834d2 Fix supported object list size bug on SwitchBCM81724 0da464b Add SwitchBCM56850 tests 4d7956b Add SwitchMLNX2700 tests 2e418ab [saivs] Refactor headers a4b15a6 Correct entry in SaiUnittests b5a2f63 Update aspell 923ab2f Add SwitchContainer tests 484beb1 Add Switch tests cc2e078 Add SwitchConfig tests 724ce74 Add TrafficFilterPipes tests 03e4923 Add HostInterfaceInfo tests 5db4e72 Add TrafficForwarder tests 1b4d6d1 Add SwitchConfigContainer tests 7a32cd6 Add Signal tests 7c016f0 Add SelectableFd tests 21e735d Update SaiUnittests tests 353a058 Add SaiUnittests tests 5572102 Fix ContextConfigContainer tests 0fd06c9 Move error to throw on sai unittests 3c3b369 Add db channel from context config to VS 330c561 Fix ResourceLimiterContainer 30f5825 Add missing files for ResourceLimiter tests 8a871ee Update aspell 467e228 Add ResourceLimiterParser tests f6b35da Add ResourceLimiterContainer tests 99f04e9 Remove default ctr/dtr from struct MACsecManager 9381f2d Add ResourceLimiter tests ab2ef9d Add RealObjectIdManager tests 5f6b004 Add NetMsgRegistrar tests 8142375 Add MACsecIngressFilter tests 888197d Add MACsecEgressFilter tests 8ed6e36 Add MACsecAttr tests b14b598 Add LaneMapFileParser tests 38a52ac Add LaneMapContainer tests 2997892 Add LaneMap tests 734c7ef Add SaiAttrWrap tests c6e7ac0 Add FdbInfo tests 7ed640d Add EventQueue tests 752d424 Add EventPayloadPacket tests 85042f4 Add EventPayloadNetLinkMsg tests 8bf97ed Add CorePortIndexMapFileParser tests ff7c6c5 Add CorePortIndexMapContainer tests 4598078 Add CorePortIndexMap tests d6f7435 Add vslib ContextConfigContainer tests bc27a04 Add sairedis api tests 9a96cd7 Fix tam tests a3bc56e Move tam api to separate test 9d1032b Add sairedis tam api tests f1570e5 Add sairedis lib tests 91ce42c Check for null pointer on bulk entries apis 78252c7 Update interface query tests cf956b6 Fix error code on dbg dump e7e1d80 Fix api query when unspecified api passed cd93183 Tests rename fix qosmaps to qosmap 5e9e0c9 Rename fix qosmaps to qosmap 5b67e6b Add virtual router tests 0d946cf Fix lag tests 27bbde7 Add udf tests 31a3613 Add tunnel tests 3366e47 Update tam tests 5b06fb3 Add tam tests 02d6d89 Add system port tests 9224e13 Add switch tests c2c0af8 Add stp tests 2192040 Add segment route tests 702dff6 Add scheduler group tests 24e3d92 Add sample packet tests fda4f80 Add rpf group tests 5ecab66 Add router interface tests 9114865 Add route tests 895129e Add queue tests e01707f Add qos map tests 8162205 Add port tests 46d15e9 Add policer tests 36cf6d1 Add next hop group tests 2200e38 Add next hop tests 1b2bf3c Fix lag tests 27a2b90 Add neighbor tests fc28438 Add nat tests 7468777 Add mpls tests 82ca7e5 Add mirror tests adbcfd9 Add mcast fdb tests d624231 Add macsec tests 72cfe42 Add lag tests 9f1b54b Add l2mc group tests d16bc95 Add l2mc tests 3d07e59 Fix isolation tests 85e5ac0 Add isolation group tests 1c4c11f Add ipcm group tests b6ed3e0 Add ipcm tests 78e8b68 Add fdb tests 8af035b Add dtel tests b56c601 Add counter tests 7c61b13 Add buffer tests fe6a041 Add bridge tests ec96469 Add bmtor tests f6d5d7d Add bfd tests d3419e0 Add acl tests 14a26b1 Add hash and hostif tests 18a09f9 Move hostintf to hostif name in lib and libvs a02b593 Add vs vlan tests 3122b37 Update wred tests 312627f Remove comments from test makefile 466a589 Update unittests 2418585 Preapre unittests skeleton 31718cf [unittest] Add unittest skeleton a4e2d28 [syncd] Fix defines in Makefile.am a4bc9e4 Remove unnecessary include from Makefiles b2e368e Update debian/libsaimetadata-dev.install 222a5b0 Update .gitignore f77ed71 Bring back pyext module 6942de0 Propagate inc and src merge 378bfff Merge include and src for lib and vslib 89c004a Whitespace refactor 3b02209 Simplify SaiInterface macros b7ec50a Add find cross include tool ce6ad22 Remove unnecessary include from SaiInterface.h 8172de2 Remove unnecessary comments for include 50bfd42 Move common SAI includes to configure.ac f40a168 Refactor Makefile.am files even more c91b117 [pyext] Update Makefile.am with top_srcdir 0a0ff45 [sairedis] Update Makefile.am 7b1a0b9 Rename saiserialize.cpp to SaiSerialize.cpp 47dac40 [vslib] Move sai_vs.cpp to sai_vs_interfacequery.cpp 39d003c Add check for configure conflict code-coverage/enable-debug add29e0 Move DBGFLAGS initialization to configure.ac e75abb7 Refactor all Makefile.am 9bb541a Remove white spaces from line endings 2e0b74b Add TODO for future split single file binaries 5b71d21 Propagate Notifications changes aaa519f Move Notificatios to libsaimeta 855be73 Move SelectableChannel classes to libsaimeta 016b5d9 [tests] [sairedis] Update include to use direct name 0fffcb0 Propagate PerformanceIntervalTimer changes 9d17b0a Move PerformanceIntervalTimer to libsaimeta cc5ab4c Move joinFieldValues to libsaimeta 638ca82 Move getHardwareInfo to libsaimeta 3951504 [vslib] Fix VirtualObjectIdManager multi arch logging 5b888a3 Remove unused SAIFLAGS from makefiles c9f05ea Remove ../ from includes 737393d Move SaiInterface to meta directory e13991a [debian] Update install to include only sai*.h files 8e3a8fb [meta] Make swap lib naming for better read in Makefile.am f1b632c Update autoclean.sh 6f319f8 Update .gitignore
Add sairedis and syncd support to handle and send back BFD session state change notifications.
…omatically (sonic-net#20263) #### Why I did it src/sonic-swss-common ``` * 24979b0 - (HEAD -> master, origin/master, origin/HEAD) Add dpu db in schema (sonic-net#903) (5 hours ago) [Ze Gan] ``` #### How I did it #### How to verify it #### Description for the changelog
No description provided.