Skip to content
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

Update sonic-sairedis submodule #15720

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Jul 5, 2023

Why I did it

This submodule update needs to be manually done due to build changes done in the sairedis submodule. Specifically, Debian build profiles are now being used instead of dpkg build targets, and dbgsym packages are being used instead of dbg packages. Because of this, there needs to be changes on the sonic-buildimage side for this.

This submodule update brings in the following changes:

ce8f642 [vs] Use boost join to concatenate switch types in config (#1266)
d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (#1259)
e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (#1262)
c08f9a2 [CI]: Fix collect log error in azp template. (#1260)
eed856c [CodeQL]: Fix syncd compilation in azp template. (#1261)
a3f1f1a Reland 'Make changes to building and packaging sairedis (#1116)' (#1194)
Work item tracking
  • Microsoft ADO (number only): 24405994

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)

@yxieca
Copy link
Contributor

yxieca commented Jul 6, 2023

@saiarcot895 can you list the commits that are included by sairedis submodule advance.

Please check the build failure.

@saiarcot895
Copy link
Contributor Author

Description has been updated with the list of commits.

The build failure appears to be a test failure in sonic_utilities; I suspect it's a transient failure.

This submodule update needs to be manually done due to build changes
done in the sairedis submodule. Specifically, Debian build profiles are
now being used instead of dpkg build targets, and dbgsym packages are
being used instead of dbg packages. Because of this, there needs to be
changes on the sonic-buildimage side for this.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@saiarcot895 saiarcot895 changed the title Add support for deb build profiles env variable, and update sairedis submodule Update sonic-sairedis submodule Jul 21, 2023
@yxieca yxieca merged commit e0927e2 into sonic-net:master Jul 25, 2023
16 checks passed
@saiarcot895 saiarcot895 deleted the update-sairedis branch July 26, 2023 01:41
dgsudharsan added a commit to dgsudharsan/sonic-buildimage that referenced this pull request Jul 26, 2023
@liushilongbuaa
Copy link
Contributor

It breaks amd64's official build.
ex: broadcom/barefoot/mellanox/...

liushilongbuaa added a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Jul 31, 2023
@saiarcot895
Copy link
Contributor Author

I have a fix in sonic-net/sonic-sairedis#1268, but it's blocked by sonic-net/sonic-sairedis#1269

@liushilongbuaa
Copy link
Contributor

Maybe the fix also need PR checker. Maybe revert 15720 first. Then let me enable PR checker for target/docker-syncd-brcm-rpc.gz.
Then you can create PR to update HEAD for sairedis?

@saiarcot895
Copy link
Contributor Author

Ok, that works

xumia pushed a commit that referenced this pull request Jul 31, 2023
This reverts commit e0927e2.


Why I did it
Reverts #15720

It breaks build for target/debs/bullseye/syncd_1.0.0_amd64.deb

make[2]: Entering directory '/sonic/src/sonic-sairedis'
dh_install
# Note: escape with an extra symbol
if [ -f debian/syncd-rpc/usr/bin/syncd_init_common.sh ] ; then
/bin/sh: 1: Syntax error: end of file unexpected (expecting "fi")
make[2]: *** [debian/rules:65: override_dh_install] Error 2
make[2]: Leaving directory '/sonic/src/sonic-sairedis'
make[1]: *** [debian/rules:51: binary] Error 2
make[1]: Leaving directory '/sonic/src/sonic-sairedis'
dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2
Work item tracking
Microsoft ADO (number only): 24691535
How I did it
How to verify it
@liushilongbuaa
Copy link
Contributor

@saiarcot895 , rpc PR checker added. Please Update sairedis again.

saiarcot895 added a commit to saiarcot895/sonic-buildimage that referenced this pull request Aug 7, 2023
This submodule update needs to be manually done due to build changes
done in the sairedis submodule. Specifically, Debian build profiles are
now being used instead of dpkg build targets, and dbgsym packages are
being used instead of dbg packages. Because of this, there needs to be
changes on the sonic-buildimage side for this.

This is a reland of sonic-net#15720, which was reverted in sonic-net#15995 due to the RPC
package build failing. That failure has since been fixed, and the
PR pipeline has been updated to build the RPC package so that this is
checked at the PR stage.

This submodule update brings in the following changes:

```
4dbdb21 Fix RPC package build failure due to shell syntax issue (sonic-net#1268)
588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (sonic-net#1269)
ce8f642 [vs] Use boost join to concatenate switch types in config (sonic-net#1266)
d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (sonic-net#1259)
e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (sonic-net#1262)
c08f9a2 [CI]: Fix collect log error in azp template. (sonic-net#1260)
eed856c [CodeQL]: Fix syncd compilation in azp template. (sonic-net#1261)
a3f1f1a Reland 'Make changes to building and packaging sairedis (sonic-net#1116)' (sonic-net#1194)
```

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@saiarcot895 saiarcot895 mentioned this pull request Aug 7, 2023
11 tasks
yxieca pushed a commit that referenced this pull request Aug 11, 2023
* Update sairedis submodule

This submodule update needs to be manually done due to build changes
done in the sairedis submodule. Specifically, Debian build profiles are
now being used instead of dpkg build targets, and dbgsym packages are
being used instead of dbg packages. Because of this, there needs to be
changes on the sonic-buildimage side for this.

This is a reland of #15720, which was reverted in #15995 due to the RPC
package build failing. That failure has since been fixed, and the
PR pipeline has been updated to build the RPC package so that this is
checked at the PR stage.

This submodule update brings in the following changes:

```
4dbdb21 Fix RPC package build failure due to shell syntax issue (#1268)
588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (#1269)
ce8f642 [vs] Use boost join to concatenate switch types in config (#1266)
d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (#1259)
e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (#1262)
c08f9a2 [CI]: Fix collect log error in azp template. (#1260)
eed856c [CodeQL]: Fix syncd compilation in azp template. (#1261)
a3f1f1a Reland 'Make changes to building and packaging sairedis (#1116)' (#1194)
```

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Update sairedis submodule with the fix for the RPC package build

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
This submodule update needs to be manually done due to build changes
done in the sairedis submodule. Specifically, Debian build profiles are
now being used instead of dpkg build targets, and dbgsym packages are
being used instead of dbg packages. Because of this, there needs to be
changes on the sonic-buildimage side for this.

This submodule update brings in the following changes:

ce8f642 [vs] Use boost join to concatenate switch types in config (sonic-net#1266)
d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (sonic-net#1259)
e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (sonic-net#1262)
c08f9a2 [CI]: Fix collect log error in azp template. (sonic-net#1260)
eed856c [CodeQL]: Fix syncd compilation in azp template. (sonic-net#1261)
a3f1f1a Reland 'Make changes to building and packaging sairedis (sonic-net#1116)' (sonic-net#1194)

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
This reverts commit e0927e2.


Why I did it
Reverts sonic-net#15720

It breaks build for target/debs/bullseye/syncd_1.0.0_amd64.deb

make[2]: Entering directory '/sonic/src/sonic-sairedis'
dh_install
# Note: escape with an extra symbol
if [ -f debian/syncd-rpc/usr/bin/syncd_init_common.sh ] ; then
/bin/sh: 1: Syntax error: end of file unexpected (expecting "fi")
make[2]: *** [debian/rules:65: override_dh_install] Error 2
make[2]: Leaving directory '/sonic/src/sonic-sairedis'
make[1]: *** [debian/rules:51: binary] Error 2
make[1]: Leaving directory '/sonic/src/sonic-sairedis'
dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2
Work item tracking
Microsoft ADO (number only): 24691535
How I did it
How to verify it
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
* Update sairedis submodule

This submodule update needs to be manually done due to build changes
done in the sairedis submodule. Specifically, Debian build profiles are
now being used instead of dpkg build targets, and dbgsym packages are
being used instead of dbg packages. Because of this, there needs to be
changes on the sonic-buildimage side for this.

This is a reland of sonic-net#15720, which was reverted in sonic-net#15995 due to the RPC
package build failing. That failure has since been fixed, and the
PR pipeline has been updated to build the RPC package so that this is
checked at the PR stage.

This submodule update brings in the following changes:

```
4dbdb21 Fix RPC package build failure due to shell syntax issue (sonic-net#1268)
588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (sonic-net#1269)
ce8f642 [vs] Use boost join to concatenate switch types in config (sonic-net#1266)
d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (sonic-net#1259)
e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (sonic-net#1262)
c08f9a2 [CI]: Fix collect log error in azp template. (sonic-net#1260)
eed856c [CodeQL]: Fix syncd compilation in azp template. (sonic-net#1261)
a3f1f1a Reland 'Make changes to building and packaging sairedis (sonic-net#1116)' (sonic-net#1194)
```

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Update sairedis submodule with the fix for the RPC package build

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
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