diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f594eb7..bf39ccd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,9 +38,9 @@ images_build: stage: build extends: .build_docker_images variables: - UNITTEST_IMAGE_TAG: unittest-self-test:latest - WPR_IMAGE_TAG: wpr-self-test:latest - BADSSL_IMAGE_TAG: badssl-self-test:latest + UNITTEST_IMAGE_TAG: unittest-tsg-diagnose:latest + WPR_IMAGE_TAG: wpr-tsg-diagnose:latest + BADSSL_IMAGE_TAG: badssl-tsg-diagnose:latest script: - mkdir images - docker build -t $UNITTEST_IMAGE_TAG -f ./unittest_python/Dockerfile ./unittest_python/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f46c09..2f6f7ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(self-test) +project(tsg-diagnose) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) include(Version) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 11873bc..c949201 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,12 +1,12 @@ -set(CPACK_PACKAGE_NAME "self-test") +set(CPACK_PACKAGE_NAME "tsg-diagnose") message(STATUS "Package: ${CPACK_PACKAGE_NAME}") set(CPACK_PACKAGE_VENDOR "TSG") -set(CPACK_PACKAGE_VERSION_MAJOR "${SELF_TEST_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${SELF_TEST_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${SELF_TEST_VERSION_PATCH}.${SELF_TEST_DESCRIBE}") -set(CMAKE_INSTALL_PREFIX "/opt/tsg/self_test") +set(CPACK_PACKAGE_VERSION_MAJOR "${TSG_DIAGNOSE_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${TSG_DIAGNOSE_VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${TSG_DIAGNOSE_VERSION_PATCH}.${TSG_DIAGNOSE_DESCRIBE}") +set(CMAKE_INSTALL_PREFIX "/opt/tsg/tsg-diagnose") set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") # RPM Build @@ -23,7 +23,7 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreunInstall.i set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall.in) install(FILES docker-compose/docker-compose.yml DESTINATION ./compose) -install(FILES docker-compose/self-test.service DESTINATION /usr/lib/systemd/system) +install(FILES docker-compose/tsg-diagnose.service DESTINATION /usr/lib/systemd/system) install(DIRECTORY images/ DESTINATION ./images) include(CPack) diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in index b774e2d..c0b657c 100644 --- a/cmake/PostInstall.in +++ b/cmake/PostInstall.in @@ -1,3 +1,3 @@ -docker load < /opt/tsg/self_test/images/badssl.tar -docker load < /opt/tsg/self_test/images/unittest.tar -docker load < /opt/tsg/self_test/images/wpr.tar \ No newline at end of file +docker load < /opt/tsg/tsg-diagnose/images/badssl.tar +docker load < /opt/tsg/tsg-diagnose/images/unittest.tar +docker load < /opt/tsg/tsg-diagnose/images/wpr.tar \ No newline at end of file diff --git a/cmake/PostunInstall.in b/cmake/PostunInstall.in index 13b3ea7..2132aa5 100644 --- a/cmake/PostunInstall.in +++ b/cmake/PostunInstall.in @@ -1,3 +1,3 @@ -docker rmi -f badssl-self-test -docker rmi -f unittest-self-test -docker rmi -f wpr-self-test \ No newline at end of file +docker rmi -f badssl-tsg-diagnose +docker rmi -f unittest-tsg-diagnose +docker rmi -f wpr-tsg-diagnose \ No newline at end of file diff --git a/cmake/PreInstall.in b/cmake/PreInstall.in index 3faa15d..35b98e9 100644 --- a/cmake/PreInstall.in +++ b/cmake/PreInstall.in @@ -1,4 +1,4 @@ -systemctl stop self-test -docker rmi -f badssl-self-test -docker rmi -f unittest-self-test -docker rmi -f wpr-self-test \ No newline at end of file +systemctl stop tsg-diagnose +docker rmi -f badssl-tsg-diagnose +docker rmi -f unittest-tsg-diagnose +docker rmi -f wpr-tsg-diagnose \ No newline at end of file diff --git a/cmake/PreunInstall.in b/cmake/PreunInstall.in index b71320f..861ed3f 100644 --- a/cmake/PreunInstall.in +++ b/cmake/PreunInstall.in @@ -1 +1 @@ -systemctl stop self-test \ No newline at end of file +systemctl stop tsg-diagnose \ No newline at end of file diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 56a6103..1e04671 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -15,28 +15,28 @@ execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} OUTPU include(${__VERSION_CONFIG}) # extract major, minor, patch version from git tag -string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" SELF_TEST_VERSION_MAJOR "${VCS_TAG}") -string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" SELF_TEST_VERSION_MINOR "${VCS_TAG}") -string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" SELF_TEST_VERSION_PATCH "${VCS_TAG}") +string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" TSG_DIAGNOSE_VERSION_MAJOR "${VCS_TAG}") +string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" TSG_DIAGNOSE_VERSION_MINOR "${VCS_TAG}") +string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" TSG_DIAGNOSE_VERSION_PATCH "${VCS_TAG}") -if(NOT SELF_TEST_VERSION_MAJOR) - set(SELF_TEST_VERSION_MAJOR 3) +if(NOT TSG_DIAGNOSE_VERSION_MAJOR) + set(TSG_DIAGNOSE_VERSION_MAJOR 3) endif() -if(NOT SELF_TEST_VERSION_MINOR) - set(SELF_TEST_VERSION_MINOR 0) +if(NOT TSG_DIAGNOSE_VERSION_MINOR) + set(TSG_DIAGNOSE_VERSION_MINOR 0) endif() -if(NOT SELF_TEST_VERSION_PATCH) - set(SELF_TEST_VERSION_PATCH 0) +if(NOT TSG_DIAGNOSE_VERSION_PATCH) + set(TSG_DIAGNOSE_VERSION_PATCH 0) endif() -set(SELF_TEST_VERSION "${SELF_TEST_VERSION_MAJOR}.${SELF_TEST_VERSION_MINOR}.${SELF_TEST_VERSION_PATCH}") -set(SELF_TEST_DESCRIBE "${VCS_SHORT_HASH}") -set(SELF_TEST_GIT_VERSION "${SELF_TEST_VERSION_MAJOR}.${SELF_TEST_VERSION_MINOR}.${SELF_TEST_VERSION_PATCH}-${SELF_TEST_DESCRIBE}") -set(SELF_TEST_VAR_VERSION "${SELF_TEST_VERSION_MAJOR}_${SELF_TEST_VERSION_MINOR}_${SELF_TEST_VERSION_PATCH}_${SELF_TEST_DESCRIBE}") +set(TSG_DIAGNOSE_VERSION "${TSG_DIAGNOSE_VERSION_MAJOR}.${TSG_DIAGNOSE_VERSION_MINOR}.${TSG_DIAGNOSE_VERSION_PATCH}") +set(TSG_DIAGNOSE_DESCRIBE "${VCS_SHORT_HASH}") +set(TSG_DIAGNOSE_GIT_VERSION "${TSG_DIAGNOSE_VERSION_MAJOR}.${TSG_DIAGNOSE_VERSION_MINOR}.${TSG_DIAGNOSE_VERSION_PATCH}-${TSG_DIAGNOSE_DESCRIBE}") +set(TSG_DIAGNOSE_VAR_VERSION "${TSG_DIAGNOSE_VERSION_MAJOR}_${TSG_DIAGNOSE_VERSION_MINOR}_${TSG_DIAGNOSE_VERSION_PATCH}_${TSG_DIAGNOSE_DESCRIBE}") # print information -message(STATUS "Welcome to SELF_TEST, Version: ${SELF_TEST_GIT_VERSION}") -add_definitions(-DSELF_TEST_GIT_VERSION=\"${SELF_TEST_GIT_VERSION}\") -add_definitions(-DSELF_TEST_VAR_VERSION=${SELF_TEST_VAR_VERSION}) +message(STATUS "Welcome to TSG_DIAGNOSE, Version: ${TSG_DIAGNOSE_GIT_VERSION}") +add_definitions(-DTSG_DIAGNOSE_GIT_VERSION=\"${TSG_DIAGNOSE_GIT_VERSION}\") +add_definitions(-DTSG_DIAGNOSE_VAR_VERSION=${TSG_DIAGNOSE_VAR_VERSION})