🎈 perf(DPISDN-7): dpdk 升级至 'dpdk-21.11.3'

dpdk 升级至 'dpdk-21.11.3'

3 files changed, 16 insertions, 16 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae5d2a4..789db37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
     GIT_STRATEGY: "clone"
-    BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:dpdk-21-11-1-mlx5-el7"
-    BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:dpdk-21-11-1-mlx5-el8"
+    BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:dpdk-21-11-mlx5-el7"
+    BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:dpdk-21-11-mlx5-el8"
 
 stages:
 - build
@@ -42,7 +42,7 @@ build-debug-for-centos7:
     - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-debug"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-debug"
     except:
     - tags
 
@@ -53,7 +53,7 @@ build-release-for-centos7:
     - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-rel"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-rel"
     except:
     - tags
 
@@ -64,7 +64,7 @@ stable-package-debug-for-centos7:
     - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-debug"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-debug"
         PULP3_REPO_NAME: platform-stable-x86_64.el7
         PULP3_DIST_NAME: platform-stable-x86_64.el7
     artifacts:
@@ -81,7 +81,7 @@ stable-package-release-for-centos7:
     - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-rel"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-rel"
         PULP3_REPO_NAME: platform-stable-x86_64.el7
         PULP3_DIST_NAME: platform-stable-x86_64.el7
     artifacts:
@@ -98,7 +98,7 @@ testing-package-debug-for-centos7:
     - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-debug"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-debug"
         PULP3_REPO_NAME: platform-testing-x86_64.el7
         PULP3_DIST_NAME: platform-testing-x86_64.el7
     artifacts:
@@ -115,7 +115,7 @@ testing-package-release-for-centos7:
     - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-rel"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-rel"
         PULP3_REPO_NAME: platform-testing-x86_64.el7
         PULP3_DIST_NAME: platform-testing-x86_64.el7
     artifacts:
@@ -153,7 +153,7 @@ build-debug-for-centos8:
     - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-debug"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-debug"
     except:
     - tags
 
@@ -164,7 +164,7 @@ build-release-for-centos8:
     - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-rel"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-rel"
     except:
     - tags
 
@@ -175,7 +175,7 @@ stable-package-debug-for-centos8:
     - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-debug"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-debug"
         PULP3_REPO_NAME: platform-stable-x86_64.el8
         PULP3_DIST_NAME: platform-stable-x86_64.el8
     artifacts:
@@ -192,7 +192,7 @@ stable-package-release-for-centos8:
     - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-rel"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-rel"
         PULP3_REPO_NAME: platform-stable-x86_64.el8
         PULP3_DIST_NAME: platform-stable-x86_64.el8
     artifacts:
@@ -209,7 +209,7 @@ testing-package-debug-for-centos8:
     - share
     variables:
         BUILD_TYPE: "Debug"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-debug"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-debug"
         PULP3_REPO_NAME: platform-testing-x86_64.el8
         PULP3_DIST_NAME: platform-testing-x86_64.el8
     artifacts:
@@ -226,7 +226,7 @@ testing-package-release-for-centos8:
     - share
     variables:
         BUILD_TYPE: "RelWithDebInfo"
-        BUILD_PREFIX: "/opt/dpdk-21.11.1-rel"
+        BUILD_PREFIX: "/opt/dpdk-21.11.3-rel"
         PULP3_REPO_NAME: platform-testing-x86_64.el8
         PULP3_DIST_NAME: platform-testing-x86_64.el8
     artifacts:
diff --git a/test/demo_test.py b/test/demo_test.py
index fd2bb6b..e99a26c 100644
--- a/test/demo_test.py
+++ b/test/demo_test.py
@@ -255,7 +255,7 @@ class TestSendAndReceive(BaseTest):
     # Run test
     def runTest(self):
         # Init & Start mrzcpd
-        mrzcpd = Mrzcpd(str(conf_demo))
+        mrzcpd = Mrzcpd(conf_demo)
         mrzcpd.start()
 
         # Create packet
diff --git a/test/mrzcpd.py b/test/mrzcpd.py
index d0d8cce..dbb2455 100644
--- a/test/mrzcpd.py
+++ b/test/mrzcpd.py
@@ -11,7 +11,7 @@ mrzcpd_run_dir = "/var/run/mrzcpd"
 
 class Mrzcpd:
     def __init__(self, conf):
-        self.conf = conf
+        self.conf = str(conf)
         self.mrzcpd_path = ptf.testutils.test_param_get(
             "source_dir") + "/build/service/mrzcpd"
         self.conf_path = ptf.testutils.test_param_get(