-
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
Single image implementation #215
Conversation
oleksandrivantsiv
commented
Jan 25, 2017
- generic image is fully backward compatible.
- generic platform for now is default platform (make configure is not required for this platform).
- add infrastructure required to build single image.
- add single image for Mellanox platform only. "sonic-mellanox.bin" is default target.
- add all required config files to single image.
- add configuration files templates and generation of config file during startup.
Single image templates implementation for Broadcom and Cavium platforms will be added as separated commits. |
can you check the build break?
|
Build failures reason is the following:
Now it can be compiled under generic platform. Generic platform is default and "make configure" is not required for it any more. To compile image the following command should be executed:
Jenkins job should be changed. |
@@ -0,0 +1,20 @@ | |||
# | |||
{% block banner %} | |||
# =========== Managed by Ansible DO NOT EDIT! ======================== |
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.
Not ansible anymore
Maybe change to sonic-config engine?
SONIC_SINGLE_IMAGE = sonic-mellanox.bin | ||
$(SONIC_SINGLE_IMAGE)_MACHINE = mellanox | ||
$(SONIC_SINGLE_IMAGE)_IMAGE_TYPE = onie | ||
$(SONIC_SINGLE_IMAGE)_DEPENDS += $(SX_KERNEL) $(KERNEL_MFT) $(MFT) |
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.
hw-management?
[ -n "$FILESYSTEM_ROOT" ] || { | ||
echo "Error: no or empty FILESYSTEM_ROOT argument" | ||
exit 1 | ||
} |
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.
can you add comment to describe what this mainly is doing?
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.
maybe simply saying load docker images and configurations
In reply to: 98135052 [](ancestors = 98135052)
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.
Done
export debian_version=`cat $FILESYSTEM_ROOT/etc/debian_version` | ||
export kernel_version={{kversion}} | ||
j2 $BUILD_TEMPLATES/sysDescription.j2 > sysDescription | ||
sudo mv sysDescription $FILESYSTEM_ROOT/etc/ssw/ |
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.
taoyu, can you take a look at this to make sure we are generate the correct sonic version here.
if [ "$?" -eq "0" ]; then | ||
docker start -a {{docker_container_name}} | ||
else | ||
docker run {{docker_image_run_opt}} --name={{docker_container_name}} {{docker_image_name}} |
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.
do you know how long it takes to run other than the start?
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.
Approximately same time. Will do a measurement.
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.
Docker run:
root@sonic:/home/admin# /usr/bin/swss.sh start
Run docker swss: time in miliseconds 1485530349782
Inside docker swss: time in miliseconds 1485530349961
1485530349961 - 1485530349782 = 179 miliseconds
Docker start:
root@sonic:/home/admin# /usr/bin/swss.sh start
Start docker swss: time in miliseconds 1485529942168
Inside docker swss: time in miliseconds 1485529942294
1485529942294 - 1485529942168 = 126 miliseconds
since docker-base is not updated, you can remove it from the changeset |
SKU should be provided during configure: make configure PLATFORM=broadcom SKU=Force10-S6000
SKU should be provided during configure: make configure PLATFORM=cavium SKU=AS7512
No test results found. |
@@ -132,15 +132,6 @@ sudo chroot $FILESYSTEM_ROOT update-initramfs -u | |||
## Install latest intel igb driver | |||
sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko | |||
|
|||
## Install package without starting service |
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.
Why remove this block?
@@ -0,0 +1,63 @@ | |||
############################################################################### | |||
# Managed by Ansible | |||
# file: ansible/roles/acs/templates/ntp.conf.j2 |
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.
Remove all the 'ansible' comments?
- Fix issue with session update observed when more than one session exist with destination IP address from the same subnet. - Fix issue with deletion of ACL rules attached to everflow session in inactive state.
Update sonic-snmpagent submodule to pick up new commits: 21d7d97 2021-07-12 Fix: SonicV2Connector behavior change: get_all will return empty dict if (#226) 0813b42 2021-07-12 Entries under .1.3.6.1.2.1.31.1.1.1.18 OID should return the "description" field of PORT_TABLE entries in APPL_DB or CONFIG_DB. (#224) 7a78703 2021-07-08 Install dotnet core to fix python gcov warning for code covery color bar showing (#215) e0f36a5 2021-06-30 [multi-asic]: Udpate to use SonicDBConfig from swsscommon (#219) 266bd15 2021-06-10 Restored snmp vlan support per RFC1213 and added the missing support for RFC2863 (#218)
14a4212 [Marvell] CPU1 failure on continuous reboot (#228) 53e75e5 hwmon: (pmbus_core) Do not enable PEC if adapter doesn't (#215) Signed-off-by: Rajkumar Pennadam Ramamoorthy <[email protected]>
Update sonic-snmpagent submodule to pick up new commits: 21d7d97 2021-07-12 Fix: SonicV2Connector behavior change: get_all will return empty dict if (sonic-net#226) 0813b42 2021-07-12 Entries under .1.3.6.1.2.1.31.1.1.1.18 OID should return the "description" field of PORT_TABLE entries in APPL_DB or CONFIG_DB. (sonic-net#224) 7a78703 2021-07-08 Install dotnet core to fix python gcov warning for code covery color bar showing (sonic-net#215) e0f36a5 2021-06-30 [multi-asic]: Udpate to use SonicDBConfig from swsscommon (sonic-net#219) 266bd15 2021-06-10 Restored snmp vlan support per RFC1213 and added the missing support for RFC2863 (sonic-net#218)
14a4212 [Marvell] CPU1 failure on continuous reboot (sonic-net#228) 53e75e5 hwmon: (pmbus_core) Do not enable PEC if adapter doesn't (sonic-net#215) Signed-off-by: Rajkumar Pennadam Ramamoorthy <[email protected]>
8bb9c5a (HEAD -> master, origin/master, origin/HEAD) Add retry reading/setting mux status to simulated y-cable driver (#221) 2ebd786 [sfp-refactor] Add initial support for SFF-8636 in sonic_xcvr (#218) 221fb8a Fix QSFP-DD power class mask (#212) 4598d40 [Y-Cable][Broadcom] upgrade to support Broadcom Y-Cable API to release 1.2 (#217) 0fdd198 [sfp-refactor] Add initial support for SFF-8436 in sonic_xcvr (#215) a09f5a3 [sfp-refactor] Add new sonic_xcvr package for common transceiver logic (#201) 7ca4f51 Update SFP index definition (#214) Signed-off-by: vaibhav-dahiya <[email protected]>
Due to rare timing issue test_sfp_insert_events failure can fail. Out of 100 iterations, the test failed on 82nd iteration. Signed-off-by: Prince George <[email protected]>
…bar showing (sonic-net#215) **- What I did** fix python gcov warning "Please install dotnet core to enable automatic generation of Html report" **- How I did it** install dotnet core
Currently, for Packet Error Checking (PEC) only the controller is checked for support. This causes problems on the cisco-8000 platform where a SMBUS transaction errors are observed. This is because PEC has to be enabled only if both controller and adapter supports it. Added code to check PEC capability for adapter and enable it only if both controller and adapter supports PEC. Signed-off-by: Madhava Reddy Siddareddygari <[email protected]>
#15952) #### Why I did it src/linkmgrd ``` * aa902a3 - (HEAD -> master, origin/master, origin/HEAD) [link prober] Increase pause/restart probe log verbosity (#213) (3 days ago) [Longxiang Lyu] * 736cdda - [active-standby] Write `unhealthy` is default route `N/A` (#214) (3 days ago) [Longxiang Lyu] * e923e15 - Add ADO to the PR template (#215) (4 days ago) [Longxiang Lyu] ``` #### How I did it #### How to verify it #### Description for the changelog
#16105) src/linkmgrd * 6ce71ba - (HEAD -> 202205, origin/202205) Add ADO to the PR template (#215) (4 hours ago) [Longxiang Lyu] * 1010d93 - [active-standby] Write `unhealthy` is default route `N/A` (#214) (4 hours ago) [Longxiang Lyu] * 15e9ca2 - [link prober] Increase pause/restart probe log verbosity (#213) (4 hours ago) [Longxiang Lyu]
#16152) #### Why I did it src/linkmgrd ``` * 40113fd - (HEAD -> 202305, origin/202305) [active-standby] Fix extra toggle observed in `config reload` (#216) (2 days ago) [Longxiang Lyu] * b6d40fc - Add ADO to the PR template (#215) (2 days ago) [Longxiang Lyu] * fe41ad2 - [active-standby] Write `unhealthy` is default route `N/A` (#214) (2 days ago) [Longxiang Lyu] * 8ff265c - [link prober] Increase pause/restart probe log verbosity (#213) (2 days ago) [Longxiang Lyu] ``` #### How I did it #### How to verify it #### Description for the changelog
sonic-net#15952) #### Why I did it src/linkmgrd ``` * aa902a3 - (HEAD -> master, origin/master, origin/HEAD) [link prober] Increase pause/restart probe log verbosity (sonic-net#213) (3 days ago) [Longxiang Lyu] * 736cdda - [active-standby] Write `unhealthy` is default route `N/A` (sonic-net#214) (3 days ago) [Longxiang Lyu] * e923e15 - Add ADO to the PR template (sonic-net#215) (4 days ago) [Longxiang Lyu] ``` #### How I did it #### How to verify it #### Description for the changelog
Why I did it To integrate ZMQ to GNMI and Orchagent, need update sonic-swss submodule to latest code. How I did it How to verify it
Cherry-pick 17483 and 17378 from public master to msft/202205