Skip to content

Upgrade mellanox platform containers (syncd / saiserver / syncd-rpc) and pmon to bullseye#10580

Merged
liat-grozovik merged 8 commits intosonic-net:masterfrom
alexrallen:syncd_bullseye_merge_2
May 10, 2022
Merged

Upgrade mellanox platform containers (syncd / saiserver / syncd-rpc) and pmon to bullseye#10580
liat-grozovik merged 8 commits intosonic-net:masterfrom
alexrallen:syncd_bullseye_merge_2

Conversation

@alexrallen
Copy link
Copy Markdown
Contributor

@alexrallen alexrallen commented Apr 14, 2022

Fixes #9279

Why I did it

Part of larger effort to move all SONiC systems to bullseye

How I did it

  1. Update container makefiles with correct dependencies
  2. Update container Dockerfile with correct base image
  3. Update container Dockerfile with correct apt dependencies
  4. Update any other makefiles with dependencies to remove python2 support
  5. Minor changes to support bullseye / python3

How to verify it

Run regression on the switch:

  1. Verify PTF community tests work
  2. Verify syncd runs and all ports come up / pass traffic
  3. Verify all platform tests succeed

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Upgrade mellanox platform containers (syncd / saiserver / syncd-rpc) and pmon to bullseye

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

Bullseye_spelling_Andy

dgsudharsan
dgsudharsan previously approved these changes Apr 14, 2022
Comment thread platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
libboost-atomic1.74.0

# Build and install python-scapy
RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_all.deb --output python-scapy_2.4.0-2_all.deb \
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Apr 14, 2022

Choose a reason for hiding this comment

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

python

Use python3 version? #Pending

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this being manually downloaded and installed here, instead of from a repo?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This package is not available in bullseye but all its dependencies are. Until ptf can sort itself out we will need to have this workaround for RPC.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Share the same concern with @saiarcot895.
Generally speaking, you are upgrading distro, not to add new feature or fix bugs, why introduce python-scapy? If it is needed, why not install by apt?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This package only exists on buster but we need it for PTF.
https://github.com/p4lang/ptf/blob/36a3e3d9ac0447d28161d24028401239d756875f/debian/control#L10

I believe it was automatically getting installed as a dependency for PTF prior to this but could not be automatically installed any longer now that python-scapy is no longer in the upstream repo.

It would be a worse hack to add buster repositories to our apt index rather than just work around and pull this manually. The problem being we need the python 2 version of this package and bullseye has removed most python2 packages.

https://packages.debian.org/buster/python-scapy

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It looks like the following PR added python3 support for PTF. So we will be able to adjust this. However I don't wish to integrate these changes into this PR, bloating this PR with even more changes than are already in it that we would have to go and test again would be unwise.

#10599

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Offline discussed and this is a temporary solution.

{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
{% endif %}

# Install pip2 since it is no longer in the APT upstream
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Apr 14, 2022

Choose a reason for hiding this comment

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

pip2

why still need pip2? #Closed

Comment thread platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf
@alexrallen
Copy link
Copy Markdown
Contributor Author

alexrallen commented Apr 14, 2022

@qiluo-msft The PTF package used in RPC requires python 2 so we need to keep python 2 in mlnx-syncd-rpc.

Right now we build straight from the upstream which does not support a python 3 dpkg build.

@alexrallen alexrallen requested a review from qiluo-msft April 14, 2022 20:14
@liat-grozovik
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@alexrallen
Copy link
Copy Markdown
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Copy Markdown
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@alexrallen
Copy link
Copy Markdown
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Copy Markdown
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@alexrallen
Copy link
Copy Markdown
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Copy Markdown
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft left a comment

Choose a reason for hiding this comment

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

LGTM. Please check with other reviewers.

@dprital
Copy link
Copy Markdown
Collaborator

dprital commented May 10, 2022

@qiluo-msft , as it was approved, who can merge it ?

@liat-grozovik liat-grozovik merged commit d202bf2 into sonic-net:master May 10, 2022
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Jun 20, 2022
…anch

Related work items: #52, #71, #73, #75, #77, sonic-net#1306, sonic-net#1588, sonic-net#1991, sonic-net#2031, sonic-net#2040, sonic-net#2053, sonic-net#2066, sonic-net#2069, sonic-net#2087, sonic-net#2107, sonic-net#2110, sonic-net#2112, sonic-net#2113, sonic-net#2117, sonic-net#2124, sonic-net#2125, sonic-net#2126, sonic-net#2128, sonic-net#2130, sonic-net#2131, sonic-net#2132, sonic-net#2133, sonic-net#2134, sonic-net#2135, sonic-net#2136, sonic-net#2137, sonic-net#2138, sonic-net#2139, sonic-net#2140, sonic-net#2143, sonic-net#2158, sonic-net#2161, sonic-net#2233, sonic-net#2243, sonic-net#2250, sonic-net#2254, sonic-net#2260, sonic-net#2261, sonic-net#2267, sonic-net#2278, sonic-net#2282, sonic-net#2285, sonic-net#2288, sonic-net#2289, sonic-net#2292, sonic-net#2294, sonic-net#8887, sonic-net#9279, sonic-net#9390, sonic-net#9511, sonic-net#9700, sonic-net#10025, sonic-net#10322, sonic-net#10479, sonic-net#10484, sonic-net#10493, sonic-net#10500, sonic-net#10580, sonic-net#10595, sonic-net#10628, sonic-net#10634, sonic-net#10635, sonic-net#10644, sonic-net#10670, sonic-net#10691, sonic-net#10716, sonic-net#10731, sonic-net#10750, sonic-net#10751, sonic-net#10752, sonic-net#10761, sonic-net#10769, sonic-net#10775, sonic-net#10776, sonic-net#10779, sonic-net#10786, sonic-net#10792, sonic-net#10793, sonic-net#10800, sonic-net#10806, sonic-net#10826, sonic-net#10839, sonic-net#10840, sonic-net#10842, sonic-net#10844, sonic-net#10847, sonic-net#10849, sonic-net#10852, sonic-net#10865, sonic-net#10872, sonic-net#10877, sonic-net#10886, sonic-net#10889, sonic-net#10903, sonic-net#10904, sonic-net#10905, sonic-net#10913, sonic-net#10914, sonic-net#10916, sonic-net#10919, sonic-net#10925, sonic-net#10926, sonic-net#10929, sonic-net#10933, sonic-net#10934, sonic-net#10937, sonic-net#10941, sonic-net#10947, sonic-net#10952, sonic-net#10953, sonic-net#10957, sonic-net#10959, sonic-net#10971, sonic-net#10972, sonic-net#10980
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.

Clean up Mellanox issue_version and MFT Makefiles

7 participants