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.

Sign up for GitHub

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

[lgtm] Fix LGTM build on 202012 branch #1921

Merged
merged 11 commits into from
Sep 24, 2021
Merged

[lgtm] Fix LGTM build on 202012 branch #1921

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
776be07
[202012] Test LGTM sai headers issue
kcudnik Sep 21, 2021
3b49f93
add find
kcudnik Sep 21, 2021
40dfaf9
update find
kcudnik Sep 21, 2021
2649e0a
add verbose on dpkg
kcudnik Sep 21, 2021
b5d5c82
add autoconf-archive
kcudnik Sep 21, 2021
c4e4689
Compile sairedis and swss-common for 202012 branch
kcudnik Sep 21, 2021
95601bb
checkout branch directly on lgtm
kcudnik Sep 21, 2021
210883f
reorder branch on clone
kcudnik Sep 21, 2021
e18451c
Dummy
kcudnik Sep 21, 2021
c370cdb
Add lzmq to cfgmgr
kcudnik Sep 21, 2021
15b389d
Remove debug stuff
kcudnik Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfgmgr/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib -I $(top_srcdir) -I $(top_srcdir)/orchagent -I $(
CFLAGS_SAI = -I /usr/include/sai
LIBNL_CFLAGS = -I/usr/include/libnl3
LIBNL_LIBS = -lnl-genl-3 -lnl-route-3 -lnl-3
SAIMETA_LIBS = -lsaimeta -lsaimetadata
SAIMETA_LIBS = -lsaimeta -lsaimetadata -lzmq

bin_PROGRAMS = vlanmgrd teammgrd portmgrd intfmgrd buffermgrd vrfmgrd nbrmgrd vxlanmgrd sflowmgrd natmgrd coppmgrd tunnelmgrd

Expand Down
19 changes: 11 additions & 8 deletions lgtm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,21 @@ extraction:
- dh-exec
- doxygen
- graphviz
- autoconf-archive
after_prepare:
- git clone https://github.com/Azure/sonic-swss-common; pushd sonic-swss-common; ./autogen.sh; fakeroot dpkg-buildpackage -us -uc -b; popd
- git clone -b 202012 https://github.com/Azure/sonic-swss-common; pushd sonic-swss-common; ./autogen.sh; fakeroot dpkg-buildpackage -us -uc -b; popd
- dpkg-deb -x libswsscommon_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
- git clone --recursive https://github.com/Azure/sonic-sairedis; pushd sonic-sairedis; ./autogen.sh; DEB_BUILD_OPTIONS=nocheck SWSS_COMMON_INC="$LGTM_WORKSPACE/usr/include" SWSS_COMMON_LIB="$LGTM_WORKSPACE/usr/lib/x86_64-linux-gnu" fakeroot debian/rules binary-syncd-vs; popd
- dpkg-deb -x libsairedis_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -x libsairedis-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -x libsaimetadata_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -x libsaimetadata-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -x libsaivs_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -x libsaivs-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
- git clone -b 202012 --recursive https://github.com/Azure/sonic-sairedis; pushd sonic-sairedis; ./autogen.sh; DEB_BUILD_OPTIONS=nocheck SWSS_COMMON_INC="$LGTM_WORKSPACE/usr/include" SWSS_COMMON_LIB="$LGTM_WORKSPACE/usr/lib/x86_64-linux-gnu" fakeroot debian/rules binary-syncd-vs; popd
- dpkg-deb -vx libsairedis_1.0.0_amd64.deb $LGTM_WORKSPACE
Copy link
Collaborator

Choose a reason for hiding this comment

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

@kcudnik do we need to remove this debug stuff: dpkg-deb -vx?

- dpkg-deb -vx libsairedis-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -vx libsaimetadata_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -vx libsaimetadata-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -vx libsaivs_1.0.0_amd64.deb $LGTM_WORKSPACE
- dpkg-deb -vx libsaivs-dev_1.0.0_amd64.deb $LGTM_WORKSPACE
Copy link
Collaborator

Choose a reason for hiding this comment

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

@kcudnik do we need to have dpkg-deb -vx in master?

Copy link
Contributor Author

@kcudnik kcudnik Sep 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

i added this for debugging, currently we dont need that

Copy link
Collaborator

Choose a reason for hiding this comment

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

@kcudnik got it

configure:
command:
- ./autogen.sh
- ls -al $LGTM_WORKSPACE/usr/include/sai || true ; ls -al /usr/include/sai || true
- find / -name sai.h -ls || true
Copy link
Collaborator

Choose a reason for hiding this comment

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

@kcudnik do we need to remove this debug stuff?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

- ./configure --prefix=/usr --with-extra-inc=$LGTM_WORKSPACE/usr/include --with-extra-lib=$LGTM_WORKSPACE/usr/lib/x86_64-linux-gnu
2 changes: 2 additions & 0 deletions orchagent/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ extern "C" {
using namespace std;
using namespace swss;



Copy link
Collaborator

Choose a reason for hiding this comment

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

@kcudnik do we need to remove this debug stuff?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

extern sai_switch_api_t *sai_switch_api;
extern sai_router_interface_api_t *sai_router_intfs_api;

Expand Down