ci: init gitlab ci

3 files changed, 90 insertions, 1 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f2f9370
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,86 @@
+variables:
+  GIT_STRATEGY: "clone"
+  BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
+  BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
+  BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
+  INSTALL_DEPENDENCY_LIBRARY:  libasan
+
+stages:
+  - build
+#  - test
+
+.build_before_script:
+  before_script:
+  - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
+  - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
+  - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
+  - chmod +x build.sh
+  - chmod +x package.sh
+  - yum makecache
+  - yum install -y libpcap-devel
+  - yum install -y elfutils-libelf-devel
+  - yum install -y libtool
+  - yum install -y which
+  - yum install -y libasan
+
+build_for_centos7:
+  variables:
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
+  stage: build
+  image: $BUILD_IMAGE_CENTOS7
+  extends: .build_before_script
+  script:
+    - ./build.sh
+    - ./package.sh
+    - cp ~/rpm_upload_tools.py ./
+    - python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} package/*.rpm
+  tags:
+    - share
+  only:
+    - /^develop.*$/i
+    - /^dev*.*$/i
+  artifacts:
+    name: "libosfp-$CI_COMMIT_REF_NAME"
+    paths:
+      - package/*.rpm
+      - config.log
+      - osfp_test.log
+
+build_for_centos8:
+  variables:
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
+  stage: build
+  image: $BUILD_IMAGE_CENTOS8
+  extends: .build_before_script
+  script:
+    - ./build.sh
+    - ./package.sh
+    - cp ~/rpm_upload_tools.py ./
+    - python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} package/*.rpm
+  tags:
+    - share
+  only:
+    - /^develop.*$/i
+    - /^dev*.*$/i
+  artifacts:
+    name: "libosfp-$CI_COMMIT_REF_NAME"
+    paths:
+      - package/*.rpm
+      - config.log
+      - osfp_test.log
+
+#run_test_for_centos7:
+#  stage: test
+#  image: $BUILD_IMAGE_CENTOS7
+#  extends: build_for_centos7
+#  script:
+#    - ./test/.libs/osfp_test -f fp.json -t data.json
+#
+#run_test_for_centos8:
+#  stage: test
+#  image: $BUILD_IMAGE_CENTOS8
+#  extends: build_for_centos8
+#  script:
+#    - ./test/.libs/osfp_test -f fp.json -t data.json
diff --git a/configure.ac b/configure.ac
index 22493eb..07f79eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,9 +7,11 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], [enable debug info])], [enable_debug=$enableval], [enable_debug=no])
 
 AS_IF([test "x$enable_debug" = xyes],
-      [CFLAGS="-DDEBUGLOG -ggdb3 -O0 -fsanitize=address -fno-omit-frame-pointer"],
+      [CFLAGS="-DDEBUGLOG -ggdb3 -O0"],
       [CFLAGS="-g -O2"])
 
+#[CFLAGS="-DDEBUGLOG -ggdb3 -O0 -fsanitize=address -fno-omit-frame-pointer"],
+
 AC_ARG_ENABLE([test], [AS_HELP_STRING([--enable-test], [enable test])], [enable_test=$enableval], [enable_test=yes])
 AS_IF([test "x$enable_test" = xyes],
       [CFLAGS="${CFLAGS} -DUNITTEST"])
diff --git a/src/osfp_fingerprint.h b/src/osfp_fingerprint.h
index 3de5edd..59e697d 100644
--- a/src/osfp_fingerprint.h
+++ b/src/osfp_fingerprint.h
@@ -43,6 +43,7 @@ struct osfp_fingerprint {
     unsigned int                value_buffer_used;
 };
 
+int osfp_fingerprint_from_json(struct osfp_fingerprint *fp, char *json_str);
 int osfp_fingerprint_to_json_buf(struct osfp_fingerprint *fp, char *strbuf, unsigned int buf_len, unsigned int format);
 
 void osfp_fingerprint_setup_field(struct osfp_fingerprint *fp, enum osfp_field_id field_id, void *value, unsigned int len);