Merge pull request #9 from Elektrobit/next

Next

.gitlab-ci.yml

@@ -1,43 +1,65 @@
 ---
 variables:
   DOCKER_HOST: "tcp://docker:2375"
+  DOCKER_IMAGE: samconf-ci:$CI_COMMIT_REF_SLUG
+
+workflow:
+  auto_cancel:
+    on_new_commit: interruptible
+
 
 stages:
+  - docker-image
   - build
   - test
 
 default:
-  image: ubuntu:jammy
+  image: $CI_REGISTRY_IMAGE/$DOCKER_IMAGE
   services:
     - name: docker:24-dind
       alias: docker
       variables:
         DOCKER_TLS_CERTDIR: ""
   tags:
       - "docker"
+  interruptible: true
 
 before_script:
-  - apt-get update
-  - apt-get install -y curl bash jq docker.io
-  - docker info
-  - ip a
   - env | sort
 
+build-docker-image:
+  stage: docker-image
+  image: ubuntu:jammy
+  before_script:
+    - apt-get update
+    - apt-get install -y docker.io
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $DOCKER_IMAGE -f ci/Dockerfile
+             --build-arg UID=$(id -u) --build-arg GID=$(id -g)
+             --build-arg ASMCOV_URI="$ASMCOV_URI"
+             ci/
+    - docker tag $DOCKER_IMAGE $CI_REGISTRY_IMAGE/$DOCKER_IMAGE
+    - docker push $CI_REGISTRY_IMAGE/$DOCKER_IMAGE
+
 build-dependencies:
   stage: build
-  needs: []
+  needs:
+    - build-docker-image
   script:
-    - ci/docker-run.sh ci/install_deps.py -c ci/dependencies_emlix.json
+    - ci/install_deps.py -c ci/dependencies_emlix.json
   artifacts:
     paths:
       - build/deps/lib/
       - build/deps/include/
 
 build-release:
   stage: build
-  needs: [build-dependencies]
+  needs:
+    - build-docker-image
+    - build-dependencies
   script:
-    - ci/docker-run.sh ci/build.sh --ci Release
+    - ci/build.sh --ci Release
   artifacts:
     paths:
       - build/Release/dist/
@@ -47,9 +69,11 @@ build-release:
 
 build-debug:
   stage: build
-  needs: [build-dependencies]
+  needs:
+    - build-docker-image
+    - build-dependencies
   script:
-    - ci/docker-run.sh ci/build.sh --ci Debug
+    - ci/build.sh --ci Debug
   artifacts:
     paths:
       - build/Debug/dist/
@@ -58,10 +82,11 @@ build-debug:
 unit-test-release:
   stage: test
   needs:
+    - build-docker-image
     - build-release
     - build-dependencies
   script:
-    - ci/docker-run.sh ci/run_utest.sh Release
+    - ci/run_utest.sh Release
   artifacts:
     when: always
     paths:
@@ -72,10 +97,11 @@ unit-test-release:
 unit-test-debug:
   stage: test
   needs:
+    - build-docker-image
     - build-debug
     - build-dependencies
   script:
-    - ci/docker-run.sh ci/run_utest.sh Debug
+    - ci/run_utest.sh Debug
   artifacts:
     when: always
     paths:
@@ -86,46 +112,52 @@ unit-test-debug:
 code-lint:
   stage: test
   needs:
+    - build-docker-image
     - build-release
     - build-dependencies
   script:
-    - ci/docker-run.sh ci/code_lint.py --ci
-    - ci/docker-run.sh ci/checklicense.sh
+    - ci/code_lint.py --ci
+    - ci/checklicense.sh
   artifacts:
     when: always
     paths:
       - build/Release/cmake/lint_results/
 
 code-coverage:
-  rules:
-    - when: never
-      allow_failure: true
   stage: test
+  tags:
+    - "intelpt"
+    - "docker"
   needs:
+    - build-docker-image
     - build-release
     - build-dependencies
   script:
-    - ci/docker-run.sh ci/create_coverage.sh
+    - cat /proc/cpuinfo
+    - ls -lah /sys/devices/intel_pt
+    - ci/create_coverage.sh
   artifacts:
     when: always
     paths:
       - build/Release/result/coverage_results/
 
 publish-kpis:
-  rules:
-    - when: never
-      allow_failure: true
-  needs: [code-coverage]
+  stage: test
+  needs:
+    - build-docker-image
+    - build-release
+    - code-coverage
   script:
-    - ci/publish_pkis.sh
+    - ci/publish_kpis.sh
 
 documentation:
   stage: build
   needs:
+    - build-docker-image
     - build-release
     - build-dependencies
   script:
-    - ci/docker-run.sh ci/build_doc.sh
+    - ci/build_doc.sh
   artifacts:
     paths:
       - build/doc/

ci/build.sh

@@ -11,15 +11,19 @@ OPTION_CI=0
 OPTION_CLEAN=0
 OPTION_VERBOSE=0
 OPTION_PACKAGE=0
-for element in "$@"; do
-    case $element in
+while [ $# -gt 0 ]; do
+    case ${1} in
         --ci)          OPTION_CI=1 ;;
         --clean|-c)    OPTION_CLEAN=1 ;;
         --verbose|-v)  OPTION_VERBOSE=1 ;;
 	--package)     OPTION_PACKAGE=1 ;;
-        -*)          echo "error: unknown option: $1"; exit 1 ;;
-        *)           PARAM="$PARAM $element" ;;
+        -D)            CMAKE_PARAM="${CMAKE_PARAM} -D ${2}"
+                       shift ;;
+        -D*)           CMAKE_PARAM="$CMAKE_PARAM} ${1}" ;;
+        -*)          echo "error: unknown option: ${1}"; exit 1 ;;
+        *)           PARAM="${PARAM} ${1}" ;;
     esac
+    shift
 done
 
 set -- $PARAM
@@ -31,7 +35,7 @@ elif [ $OPTION_CI -eq 1 ]; then
         echo "error: build-type must be explicitely set in CI mode"
         exit 1
     fi
-    CMAKE_PARAM="-DENABLE_CI=1"
+    CMAKE_PARAM="${CMAKE_PARAM} -DENABLE_CI=1"
     OPTION_CLEAN=1
     OPTION_VERBOSE=1
 fi

ci/create_debian_release.sh

@@ -32,7 +32,7 @@ function create_and_publish_debian_main() {
   rm debian/README.md
   echo "3.0 (quilt)" > debian/source/format
 
-  dch -M "--newversion=${NEW_VERSION}-1" "New upstream tag ${NEW_VERSION}"
+  dch -D unstable -M "--newversion=${NEW_VERSION}-1" "New upstream tag ${NEW_VERSION}"
   git add debian/ && git commit -m "New upstream tag ${NEW_VERSION}"
   git checkout HEAD -- debian.native && git clean -fxd -- debian.native
 }

ci/publish_kpis.sh

@@ -23,7 +23,7 @@ function add_kpi {
 }
 
 function push_all_kpis {
-    curl -v -i "${KPI_API_URL}" \
+    curl -v --http1.1 -i "${KPI_API_URL}" \
         --header "Authorization: Token ${KPI_API_TOKEN}" \
         --header "Content-Type: text/plain; charset=utf-8" \
         --data-binary "@/tmp/kpis_to_send"

cmake/project.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-set(SAMCONF_VERSION 0.54.0)
+set(SAMCONF_VERSION 0.56.3)
 
 # Attention: Aside from the version, as many things as possible in this file
 #   should be put into functions, as this solves potential issues with commands
@@ -21,6 +21,7 @@ macro(project_set_environment)
   option(ENABLE_ANALYZER "Build with -fanalyzer" ON)
   option(ENABLE_CI "Use CI mode for building" OFF)
   option(ENABLE_ASAN "Link with ASAN" ON)
+  option(ENABLE_GIT_VERSION "Enable the git hash for the version" ON)
 
   option(UNIT_TESTS "Build unit tests" ${SAMCONF_BUILD_DEFAULTS})
   option(INSTALL_UNIT_TESTS "Install unit tests" ${UNIT_TESTS})
@@ -69,7 +70,6 @@ macro(project_set_environment)
   endif()
 endmacro()
 
-find_package(Git REQUIRED)
 function(project_set_version_variables)
   if(ARGN)
     cmake_parse_arguments(PSVV "" "NAME" "" ${ARGN})
@@ -89,17 +89,22 @@ function(project_set_version_variables)
   set(${ver_micro_name} ${PROJECT_VERSION_PATCH} PARENT_SCOPE)
   set(PKG_VERSION ${ver_pkg} PARENT_SCOPE)
 
-  execute_process(
-    COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    RESULT_VARIABLE exit_code
-    OUTPUT_VARIABLE git_output
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(NOT exit_code EQUAL 0)
-    message(WARNING "failed to retrive git short commit hash")
+  if (ENABLE_GIT_VERSION)
+    find_package(Git REQUIRED)
+    execute_process(
+      COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
+      WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+      RESULT_VARIABLE exit_code
+      OUTPUT_VARIABLE git_output
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(NOT exit_code EQUAL 0)
+      message(WARNING "failed to retrive git short commit hash")
+      set(git_output "none")
+    endif()
+  else ()
     set(git_output "none")
-  endif()
+  endif ()
   set(${ver_git_name} ${git_output} PARENT_SCOPE)
   message(STATUS "-- Set version for ${prj_name}: ${ver_pkg}.${git_output}")
 endfunction()

debian.native/control

@@ -74,6 +74,7 @@ Depends:
  ${misc:Depends},
  libsamconf0 (= ${binary:Version}),
  libmock-samconf0 (= ${binary:Version}),
+ libsamconf-test-utils0 (= ${binary:Version}),
  libsafu-dev,
 Description: Development package for signed and mergable configuration
  It stands for signed and mergable configuration. It is used by elos. The

src/demo/samprobe.c

@@ -131,7 +131,8 @@ int main(int argc, char **argv) {
         fprintf(stderr, "ERR: Signature was invalid");
         return EXIT_FAILURE;
     } else if (config == NULL) {
-        fprintf(stderr, "ERR: unexpected error occuirred, where config was initialized but no expected error was caught");
+        fprintf(stderr,
+                "ERR: unexpected error occurred, where config was initialized but no expected error was caught");
         return EXIT_FAILURE;
     }