Merge branch 'master' into master

sonic-net · May 13, 2024 · e7aae6e · e7aae6e
2 parents 9e1ac63 + adece7c
commit e7aae6e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -82,8 +82,6 @@ stages:
         patterns: |
             target/debs/bookworm/libyang*.deb
             target/debs/bookworm/libnl*.deb
-            target/debs/bookworm/libswsscommon*.deb
-            target/debs/bookworm/python3-swsscommon*.deb
             target/python-wheels/bookworm/sonic_yang_models*.whl
       displayName: "Download bookworm debs"
 
@@ -124,14 +122,26 @@ stages:
         curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         sudo apt-add-repository https://packages.microsoft.com/debian/12/prod
         sudo apt-get update
-        sudo apt-get install -y dotnet-sdk-7.0
+        sudo apt-get install -y dotnet-sdk-8.0
       displayName: "Install .NET CORE"
 
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: build
+        pipeline: Azure.sonic-swss-common
+        artifact: sonic-swss-common-bookworm
+        runVersion: 'latestFromBranch'
+        runBranch: 'refs/heads/$(BUILD_BRANCH)'
+      displayName: "Download sonic-swss-common"
+
     - script: |
+        set -ex
         # LIBSWSSCOMMON
-        sudo dpkg -i ../target/debs/bookworm/libswsscommon_1.0.0_amd64.deb
-        sudo dpkg -i ../target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb
-        sudo dpkg -i ../target/debs/bookworm/python3-swsscommon_1.0.0_amd64.deb
+        sudo dpkg -i libswsscommon_1.0.0_amd64.deb
+        sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb
+        sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
+      workingDirectory: $(Pipeline.Workspace)/
       displayName: 'Install libswsscommon package'
 
     - script: |

diff --git a/sonic_data_client/client_test.go b/sonic_data_client/client_test.go
@@ -448,9 +448,15 @@ func TestZmqReconnect(t *testing.T) {
 		t.Errorf("Receive data from ZMQ failed")
 	}
 
+	client.Close()
 	swsscommon.DeleteZmqConsumerStateTable(consumer)
+	swsscommon.DeleteZmqClient(client.zmqClient)
 	swsscommon.DeleteZmqServer(zmqServer)
 	swsscommon.DeleteDBConnector(db)
+
+	for _, client := range zmqClientMap {
+		swsscommon.DeleteZmqClient(client)
+	}
 }
 
 func TestRetryHelper(t *testing.T) {
@@ -613,4 +619,8 @@ func TestGetZmqClient(t *testing.T) {
 	swsscommon.DeleteTable(dpusTable)
 	swsscommon.DeleteTable(dhcpPortTable)
 	swsscommon.DeleteDBConnector(configDb)
+
+	for _, client := range zmqClientMap {
+		swsscommon.DeleteZmqClient(client)
+	}
 }
diff --git a/sonic_data_client/mixed_db_client.go b/sonic_data_client/mixed_db_client.go
@@ -1548,10 +1548,6 @@ func (c *MixedDbClient) Close() error {
 		swsscommon.DeleteSonicDBKey(c.dbkey)
 	}
 
-	for _, client := range zmqClientMap {
-		swsscommon.DeleteZmqClient(client)
-	}
-
 	return nil
 }