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

[sonic-swss-common] submodule update #9322

Merged
merged 1 commit into from
Nov 23, 2021
Merged

Conversation

donNewtonAlpha
Copy link
Contributor

@donNewtonAlpha donNewtonAlpha commented Nov 19, 2021

signed-off-by: Don Newton don@opennetworking.org

Why I did it

Submodule update for sonic-swss-common
Incorporates:

95aec72 2021-11-19 [PINS] Add Bazel support for external projects (#557)
1dfe06f 2021-11-18 P4Runtime : Status Code additions (#545)
8c93532 2021-11-18 Ported Marvell armhf build on amd64 host for debian buster to use cross-comp… (#501)
74264d9 2021-11-17 [PINS] Add AppDB ACL schema values shared between the P4RT app and P4Orch (#556)
a18618f 2021-11-15 [schema] Add vnet route tunnel and advertise network tables for state db (#560)
155770e 2021-11-12 [VS test] Increase test timeout (#559)
2b11dea 2021-11-08 [PINS] Update Redis schema to match P4Orch (#548)
be7d483 2021-11-08 [schema] add ACL_TABLE_TYPE table (#546)

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)

@donNewtonAlpha
Copy link
Contributor Author

@prsunny this is the pr that brings in the sonic-swss-common changes from 545

@donNewtonAlpha
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@prsunny
Copy link
Contributor

prsunny commented Nov 19, 2021

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@saiarcot895
Copy link
Contributor

I see sonic-net/sonic-swss-common#558 is now included in this PR. With that change, there needs to be a corresponding change in sonic-buildimage as well, specifically in rules/sonic-swss-common.mk:

diff --git a/rules/swss-common.mk b/rules/swss-common.mk
index 83a8d0f19..1a17d5e53 100644
--- a/rules/swss-common.mk
+++ b/rules/swss-common.mk
@@ -20,6 +20,8 @@ $(eval $(call add_derived_package,$(LIBSWSSCOMMON),$(LIBSWSSCOMMON_DEV)))
 ifeq ($(ENABLE_PY2_MODULES), y)
     PYTHON_SWSSCOMMON = python-swsscommon_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb
     $(eval $(call add_derived_package,$(LIBSWSSCOMMON),$(PYTHON_SWSSCOMMON)))
+else
+    $(LIBSWSSCOMMON)_BUILD_ENV += DEB_BUILD_PROFILES=nopython2
 endif

 PYTHON3_SWSSCOMMON = python3-swsscommon_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb

@donNewtonAlpha
Copy link
Contributor Author

I see Azure/sonic-swss-common#558 is now included in this PR. With that change, there needs to be a corresponding change in sonic-buildimage as well, specifically in rules/sonic-swss-common.mk:

diff --git a/rules/swss-common.mk b/rules/swss-common.mk
index 83a8d0f19..1a17d5e53 100644
--- a/rules/swss-common.mk
+++ b/rules/swss-common.mk
@@ -20,6 +20,8 @@ $(eval $(call add_derived_package,$(LIBSWSSCOMMON),$(LIBSWSSCOMMON_DEV)))
 ifeq ($(ENABLE_PY2_MODULES), y)
     PYTHON_SWSSCOMMON = python-swsscommon_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb
     $(eval $(call add_derived_package,$(LIBSWSSCOMMON),$(PYTHON_SWSSCOMMON)))
+else
+    $(LIBSWSSCOMMON)_BUILD_ENV += DEB_BUILD_PROFILES=nopython2
 endif

 PYTHON3_SWSSCOMMON = python3-swsscommon_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb

Would it be better for me to back out that commit from the submodule or can that be a separate PR? I was just moving the pointer to the HEAD.
Don

@donNewtonAlpha donNewtonAlpha changed the title Updating sonic-swss-common ref to pull/545 [sonic-swss-common] submodule update Nov 19, 2021
@donNewtonAlpha
Copy link
Contributor Author

@prsunny @qiluo-msft The build jobs are failing but if you look in azure pipelines it is way past where it builds swss-common and swss. The tests that are failing are within the management container. Would it be possible to get this merged so we can get the tests running on swss/pull/1992 ?

@shi-su
Copy link
Contributor

shi-su commented Nov 22, 2021

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@donNewtonAlpha
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Incorporates:

95aec72 2021-11-19 [PINS] Add Bazel support for external projects (sonic-net#557)
1dfe06f 2021-11-18 P4Runtime : Status Code additions (sonic-net#545)
8c93532 2021-11-18 Ported Marvell armhf build on amd64 host for debian buster to use cross-comp… (sonic-net#501)
74264d9 2021-11-17 [PINS] Add AppDB ACL schema values shared between the P4RT app and P4Orch (sonic-net#556)
a18618f 2021-11-15 [schema] Add vnet route tunnel and advertise network tables for state db (sonic-net#560)
155770e 2021-11-12 [VS test] Increase test timeout (sonic-net#559)
2b11dea 2021-11-08 [PINS] Update Redis schema to match P4Orch (sonic-net#548)
be7d483 2021-11-08 [schema] add ACL_TABLE_TYPE table (sonic-net#546)

Signed-off-by: Don Newton <don@opennetworking.org>
@bocon13
Copy link
Contributor

bocon13 commented Nov 22, 2021

Rebased to latest master

@donNewtonAlpha
Copy link
Contributor Author

/azpw run LGTM analysis: Python

@mssonicbld
Copy link
Collaborator

/AzurePipelines run LGTM analysis: Python

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@prsunny prsunny merged commit d063c7d into sonic-net:master Nov 23, 2021
@shi-su shi-su mentioned this pull request Nov 23, 2021
5 tasks
@bocon13 bocon13 deleted the common-sub branch November 23, 2021 21:44
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.

6 participants