diff options
| -rw-r--r-- | .gitlab-ci.yml | 44 | ||||
| -rw-r--r-- | cmake/Package.cmake | 35 | ||||
| -rw-r--r-- | infra/test/common.h | 1 |
3 files changed, 61 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b425e2..7b31780 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +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_IMAGE_CENTOS9_AARCH64: "git.mesalab.cn:7443/mesa_platform/marsio-build-env:rocky9-aarch64" BUILD_ROOT_DIR: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH/build stages: @@ -125,23 +125,49 @@ testing-package-for-centos8: rules: - if: $CI_COMMIT_BRANCH =~ /^dev.*$/ -fuzzing_mrzcpd_for_centos8: +build-for-centos9-aarch64: extends: .build_and_test + image: ${BUILD_IMAGE_CENTOS9_AARCH64} + tags: + - tsg-os-builder-aarch64 + variables: + TEST_OPTIONS: "ENABLE_CTEST" + parallel: + matrix: + - BUILD_TYPE: ["RelWithDebInfo","Debug"] + OTHER_CMAKE_OPTION: + - "-DMACHINE=aarch64 -DENABLE_PTF_TEST=TRUE" + +testing-package-for-centos9-aarch64: + extends: .package_and_deploy + image: ${BUILD_IMAGE_CENTOS9_AARCH64} + tags: + - tsg-os-builder-aarch64 variables: - BUILD_TYPE: "RelWithDebInfo" - OTHER_CMAKE_OPTION: "-DMACHINE=corei7 -DENABLE_FUZZING_TEST=ON" + TEST_OPTIONS: "ENABLE_PACKAGE_TEST" + PULP3_REPO_NAME: "platform-testing-aarch64.el9" + PULP3_DIST_NAME: "platform-testing-aarch64.el9" + parallel: + matrix: + - BUILD_TYPE: ["RelWithDebInfo","Debug"] + OTHER_CMAKE_OPTION: + - "-DMACHINE=aarch64 -DENABLE_PTF_TEST=TRUE" rules: - - if: $CI_COMMIT_BRANCH =~ /^fuzzing/ + - if: $CI_COMMIT_BRANCH =~ /^dev.*$/ -build_for_centos8_aarch64: - image: ${BUILD_IMAGE_CENTOS8_AARCH64} +stable-package-for-centos9-aarch64: + extends: .package_and_deploy + image: ${BUILD_IMAGE_CENTOS9_AARCH64} tags: - tsg-os-builder-aarch64 - extends: .build_and_test variables: - TEST_OPTIONS: "ENABLE_CTEST" + TEST_OPTIONS: "ENABLE_PACKAGE_TEST" + PULP3_REPO_NAME: "platform-stable-aarch64.el9" + PULP3_DIST_NAME: "platform-stable-aarch64.el9" parallel: matrix: - BUILD_TYPE: ["RelWithDebInfo","Debug"] OTHER_CMAKE_OPTION: - "-DMACHINE=aarch64 -DENABLE_PTF_TEST=TRUE" + rules: + - if: $CI_COMMIT_TAG
\ No newline at end of file diff --git a/cmake/Package.cmake b/cmake/Package.cmake index d227999..f487087 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,7 +1,29 @@ -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_PACKAGE_NAME "mrzcpd-debug-${MACHINE}") +if(MACHINE STREQUAL ${AARCH64}) +# Under the aarch64 architecture, marsio does not distinguish between machines + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(PACKAGE_NAME_DEBUG "mrzcpd-debug") + else() + set(PACKAGE_NAME "mrzcpd") + endif() else() - set(CPACK_PACKAGE_NAME "mrzcpd-${MACHINE}") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(PACKAGE_NAME_DEBUG "mrzcpd-debug-${MACHINE}") + else() + set(PACKAGE_NAME "mrzcpd-${MACHINE}") + endif() +endif() + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CPACK_PACKAGE_NAME ${PACKAGE_NAME_DEBUG}) +else() + set(CPACK_PACKAGE_NAME ${PACKAGE_NAME}) +endif() + +# Must uninstall the debug package before install release package +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CPACK_RPM_PACKAGE_CONFLICTS ${PACKAGE_NAME}) +else() + set(CPACK_RPM_PACKAGE_CONFLICTS ${PACKAGE_NAME_DEBUG}) endif() message(STATUS "Package: ${CPACK_PACKAGE_NAME}") @@ -29,13 +51,6 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.i set(CPACK_RPM_PACKAGE_REQUIRES "wireshark") -# Must uninstall the debug package before install release package -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-${MACHINE}") -else() - set(CPACK_RPM_PACKAGE_CONFLICTS "mrzcpd-debug-${MACHINE}") -endif() - # setup %config(noreplace) set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/mrglobal.conf" "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/mrtunnat.conf" diff --git a/infra/test/common.h b/infra/test/common.h index 228269e..8859574 100644 --- a/infra/test/common.h +++ b/infra/test/common.h @@ -1,5 +1,6 @@ #pragma once +#include <cstdlib> #include <memory> #include <rte_mbuf.h> |