Skip to content

Revert "Dell S6100: Addition of SFP ports (#9820)"#9872

Merged
lguohan merged 1 commit intosonic-net:masterfrom
tjchadaga:master
Jan 27, 2022
Merged

Revert "Dell S6100: Addition of SFP ports (#9820)"#9872
lguohan merged 1 commit intosonic-net:masterfrom
tjchadaga:master

Conversation

@tjchadaga
Copy link
Contributor

This reverts commit 5334712.

Why I did it

Master image build break - changes to reviewed and re-merged with appropriate fix

====================================================================== 
FAIL: test_buffers_dell6100_render_template (tests.test_j2files.TestJ2Files) 
---------------------------------------------------------------------- 
Traceback (most recent call last): 
File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 246, in test_buffers_dell6100_render_template 
self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json') 
File "/sonic/src/sonic-config-engine/tests/test_j2files.py", line 243, in _test_buffers_render_template 
assert filecmp.cmp(sample_output_file, self.output_file) 
AssertionError 

How I did it

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

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

@tjchadaga tjchadaga requested a review from lguohan January 27, 2022 18:28
@lguohan lguohan merged commit 3bc5053 into sonic-net:master Jan 27, 2022
@aravindmani-1
Copy link
Contributor

@tjchadaga ,I could see that in PR9820, all checks are passed(https://github.com/Azure/sonic-buildimage/pull/9820/checks). Is this issue is still seen?.

@tjchadaga
Copy link
Contributor Author

@tjchadaga ,I could see that in PR9820, all checks are passed(https://github.com/Azure/sonic-buildimage/pull/9820/checks). Is this issue is still seen?.

Yes, the error mentioned above was causing master image build to fail, hence reverted it for now. It seems to have been missed by the PR builds.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants