Skip to content

Add QoS settings for Arista-7060X6-64PE-O128S2#22432

Merged
kperumalbfn merged 4 commits intosonic-net:masterfrom
rick-arista:Arista-7060X6-64PE-O128S2
May 2, 2025
Merged

Add QoS settings for Arista-7060X6-64PE-O128S2#22432
kperumalbfn merged 4 commits intosonic-net:masterfrom
rick-arista:Arista-7060X6-64PE-O128S2

Conversation

@rick-arista
Copy link
Copy Markdown
Contributor

Why I did it

Add QoS settings for Arista-7060X6-64PE-O128S2

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@kperumalbfn
Copy link
Copy Markdown
Contributor

image

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Contributor

@kperumalbfn kperumalbfn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kperumalbfn kperumalbfn merged commit 3b7d7c0 into sonic-net:master May 2, 2025
19 checks passed
@bhouse-nexthop
Copy link
Copy Markdown
Collaborator

This PR appears to be causing build failures:

						echo "eth$i:$lanes" >> device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/lanemap.ini; \
						if [ $num_columns -ge 9 ]; then \
							core=$(echo "$line" | awk '{print $8}'); \
							core_port=$(echo "$line" | awk '{print $9}'); \
							echo "eth$i:$core,$core_port" >> device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/coreportindexmap.ini; \
						fi; \
					fi; \
				done < device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/port_config.ini; \
			fi; \
			if [ -f $(dirname $d)/chassisdb.conf ]; then \
				if [ -f device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/lanemap.ini ]; then \
					echo "Cpu0:999" >> device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/lanemap.ini; \
					i=$(($i+1)); \
				fi; \
				if [ -f device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/coreportindexmap.ini ]; then \
					echo "Cpu0:0,0" >> device/x86_64-kvm_x86_64-r0/$(basename $d)/$(basename $subdir)/coreportindexmap.ini; \
				fi; \
			fi; \
		fi; \
	done; \
done;
# Build the package
dpkg-buildpackage -rfakeroot -b -us -uc -j4 --admindir /sonic/dpkg/tmp.IQr038n5JN
popd
mv sonic-device-data_1.0-1_all.deb /sonic/target/debs/bookworm/
/sonic/src/sonic-device-data/src /sonic/src/sonic-device-data
cp: cannot stat '../../../device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128/buffers_defaults_lt2.j2': No such file or directory
cp: cannot stat '../../../device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-O128S2/buffers_defaults_lt2.j2': No such file or directory
make[1]: *** [Makefile:8: /sonic/target/debs/bookworm/sonic-device-data_1.0-1_all.deb] Error 1
make[1]: Leaving directory '/sonic/src/sonic-device-data'
[  FAIL LOG END  ] [ target/debs/bookworm/sonic-device-data_1.0-1_all.deb ]

@bingwang-ms
Copy link
Copy Markdown
Contributor

@rick-arista Can you also update QoS setting for buffers_defaults_lt2.j2?

@kperumalbfn
Copy link
Copy Markdown
Contributor

@r12f could you approve this to 202412

@mssonicbld
Copy link
Copy Markdown
Collaborator

Cherry-pick PR to msft-202412: Azure/sonic-buildimage-msft#1088

@yejianquan
Copy link
Copy Markdown
Contributor

Hi @r12f , 202505 branched out around 5/16, this commit is included when created, removing request labels

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.

8 participants