Add aarch64 build to CI

5 files changed, 25 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a6f967..9b425e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 variables:
     GIT_STRATEGY: "clone"
     BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:dpdk-21-11-mlx5-el8"
+    BUILD_IMAGE_CENTOS8_AARCH64: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:rockylinux8-aarch64"
     BUILD_ROOT_DIR: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH/build
 
 stages:
@@ -9,7 +10,7 @@ stages:
 
 .build_before_script:
     before_script:
-        - yum install -y wireshark
+        - yum install -y wireshark iproute
         - pip3 install msgpack
         - mkdir -p /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_NAMESPACE/
         - ln -s $CI_PROJECT_DIR /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH
@@ -89,7 +90,8 @@ build_for_centos8_and_enable_ctest:
     parallel:
         matrix:
             - BUILD_TYPE: ["RelWithDebInfo","Debug"]
-              OTHER_CMAKE_OPTION: "-DMACHINE=corei7 -DENABLE_PTF_TEST=TRUE"
+              OTHER_CMAKE_OPTION: 
+                - "-DMACHINE=corei7 -DENABLE_PTF_TEST=TRUE"
 
 stable-package-for-centos8:
     extends: .package_and_deploy
@@ -131,4 +133,15 @@ fuzzing_mrzcpd_for_centos8:
     rules:
         - if: $CI_COMMIT_BRANCH =~ /^fuzzing/
 
-
+build_for_centos8_aarch64:
+    image: ${BUILD_IMAGE_CENTOS8_AARCH64}
+    tags: 
+        - tsg-os-builder-aarch64
+    extends: .build_and_test
+    variables:
+        TEST_OPTIONS: "ENABLE_CTEST"
+    parallel:
+        matrix:
+            - BUILD_TYPE: ["RelWithDebInfo","Debug"]
+              OTHER_CMAKE_OPTION: 
+                - "-DMACHINE=aarch64 -DENABLE_PTF_TEST=TRUE"
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d6f7904..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "support/MESA_prof_load"]
-	path = support/MESA_prof_load
-	url = [email protected]:luqiuwen/MESA_prof_load.git
-[submodule "support/MESA_htable"]
-	path = support/MESA_htable
-	url = [email protected]:luqiuwen/MESA_htable.git
diff --git a/service/test/test_node_ef.c b/service/test/test_node_ef.c
index 2aaf4b3..fcab6d3 100644
--- a/service/test/test_node_ef.c
+++ b/service/test/test_node_ef.c
@@ -698,7 +698,7 @@ static void testcase_ef_adapter_handle_failure(void ** state)
 #define LCORE_CACHE_SIZE 64
 #define SC_EF_PEER_ENTRIES 256
 // #define SC_EF_PEER_MEMBER (SC_EF_PEER_ENTRIES + (RTE_MAX_LCORE - 1) * (LCORE_CACHE_SIZE - 1) + 1)
-#define SC_EF_PEER_CAPACITY_CALC(entries, cache_size) ((entries) + (RTE_MAX_LCORE - 1) * ((cache_size)-1) + 1)
+#define SC_EF_PEER_CAPACITY_CALC(entries, cache_size) ((entries) + (RTE_MAX_LCORE - 1) * ((cache_size) - 1) + 1)
 
 struct ef_peer_handle;
 union ef_peer_key {
@@ -707,7 +707,6 @@ union ef_peer_key {
         uint32_t ip_src;
         struct rte_ether_addr mac_src;
     };
-    xmm_t xmm;
 };
 
 extern int ef_peer_handle_delete(struct ef_peer_handle * ef_peer_handle);
diff --git a/test/ptf_test/CMakeLists.txt b/test/ptf_test/CMakeLists.txt
index 30d45a5..54cc791 100644
--- a/test/ptf_test/CMakeLists.txt
+++ b/test/ptf_test/CMakeLists.txt
@@ -14,8 +14,9 @@ execute_process(
 
 # Check veth create
 if(VETH_RESULT)
-message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/create_veth.sh create 24")
-    message(FATAL_ERROR "Failed to create veth: ${VETH_ERROR}")
+    message(WARNING "${CMAKE_CURRENT_SOURCE_DIR}/create_veth.sh create 24 failed.\n \
+     Standard Output: ${VETH_OUTPUT}. \n \
+     Standard error output: ${VETH_ERROR}")
 endif()
 
 # Create veth for msgpack
@@ -29,8 +30,9 @@ execute_process(
 
 # Check veth create for msgpack
 if(VETH_RESULT)
-message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/create_veth.sh create msgpack")
-    message(FATAL_ERROR "Failed to create veth: ${VETH_ERROR}")
+    message(WARNING "${CMAKE_CURRENT_SOURCE_DIR}/create_veth.sh create msgpack.\n \
+     Standard Output: ${VETH_OUTPUT}. \n \
+     Standard error output: ${VETH_ERROR}")
 endif()
 
 # Script for generating "--interface"
diff --git a/test/ptf_test/create_veth.sh b/test/ptf_test/create_veth.sh
index ed00dd6..408f469 100644
--- a/test/ptf_test/create_veth.sh
+++ b/test/ptf_test/create_veth.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 function create_veth() {
   ip link add veth$1 type veth peer name veth$1-ptf$1
   ip link set veth$1 up