🐎 ci(envelope_rpm_for_centos8):v4.3.10

3 files changed, 38 insertions, 26 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e809e90..6c27c5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   INSTALL_DEPENDENCY_LIBRARY: 
     libunwind gperftools numactl-devel zlib-devel librdkafka-devel systemd-devel jemalloc jemalloc-devel vim-common 
     libMESA_htable-devel libMESA_prof_load-devel libcjson-devel libMESA_field_stat2-devel  framework_env 
-    libwiredcfg-devel libWiredLB-devel libMESA_handle_logger-devel libbreakpad_mini-devel  mrzcpd
+    libwiredcfg-devel libWiredLB-devel libMESA_handle_logger-devel libbreakpad_mini-devel  mrzcpd hasp-tools
     libMESA_jump_layer-devel libMESA_jump_layer
   SYMBOL_TARGET: sapp
   INSTALL_PREFIX: "/home/mesasoft/sapp_run/"
@@ -14,7 +14,6 @@ variables:
 stages:
 - build
 - envelope
-- upload
 - test
 
 .build_before_script:
@@ -343,7 +342,7 @@ release_build_release_for_centos8:
 ###############################################################################
 # envelope and upload
 ###############################################################################
-envelope_rpm:
+envelope_rpm_for_centos7:
   stage: envelope
   image: $BUILD_IMAGE_CENTOS7
   variables:
@@ -355,11 +354,10 @@ envelope_rpm:
     FEATURE_ID: 100
     HASP_INTERNAL_S: 3600
     PACKAGE: 1
-  extends: .build_before_script
-  script:
-    - yum install -y hasp-tools
-    - chmod +x ./ci/travis.sh
-    - ./ci/travis.sh
+    UPLOAD: 1    
+    PULP3_REPO_NAME: platform-stable-x86_64.el7
+    PULP3_DIST_NAME: platform-stable-x86_64.el7  
+  extends: .build_by_travis_for_centos7
   artifacts:
     name: "sapp-pr-$CI_COMMIT_REF_NAME-release"
     paths:
@@ -368,19 +366,29 @@ envelope_rpm:
     - share
   only:
     - tags  
-     
-upload_enveloped_rpm:
-  stage: upload
-  image: $BUILD_IMAGE_CENTOS7
+
+envelope_rpm_for_centos8:
+  stage: envelope
+  image: $BUILD_IMAGE_CENTOS8
   variables:
-    PULP3_REPO_NAME_EL7: platform-stable-x86_64.el7
-    PULP3_DIST_NAME_EL7: platform-stable-x86_64.el7
-    PULP3_REPO_NAME_EL8: platform-stable-x86_64.el8
-    PULP3_DIST_NAME_EL8: platform-stable-x86_64.el8
-  script:
-    - chmod +x ./ci/upload_enveloped_rpm.sh
-    - ./ci/upload_enveloped_rpm.sh
+    BUILD_TYPE: RelWithDebInfo
+    CAPTURE_MODE: MARSIO
+    PLATFORM_MODE: INLINE
+    MEM_POOL: JEMALLOC
+    HASP_ENABLED: "ON"
+    FEATURE_ID: 100
+    HASP_INTERNAL_S: 3600
+    PACKAGE: 1
+    UPLOAD: 1   
+    PULP3_REPO_NAME: platform-stable-x86_64.el8
+    PULP3_DIST_NAME: platform-stable-x86_64.el8     
+  extends: .build_by_travis_for_centos8
+  artifacts:
+    name: "sapp-pr-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*-pr-*.rpm
   tags:
     - share
   only:
-    - tags
+    - tags  
+
diff --git a/ci/travis.sh b/ci/travis.sh
index 8588ab3..509f63d 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -74,7 +74,11 @@ fi
 
 if [ -n "${UPLOAD}" ]; then	
 	cp ~/rpm_upload_tools.py ./
-	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
+    if [ -n "${HASP_ENABLED}" ]; then	
+	    python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *-pr-*.rpm
+    else
+	    python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
+    fi
 fi
 
 #if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
diff --git a/ci/upload_enveloped_rpm.sh b/ci/upload_enveloped_rpm.sh
index dd10318..48cce52 100644
--- a/ci/upload_enveloped_rpm.sh
+++ b/ci/upload_enveloped_rpm.sh
@@ -3,21 +3,21 @@
 cd $CI_PROJECT_DIR/build/
 cp ~/rpm_upload_tools.py ./
 
-ls -ahl *.rpm
+ls -ahl ${RPM_PREFIX}-pr-*.rpm
 
-RPM_IS_EL7=`ls -ahl *-pr-*.rpm | grep el7 | wc -l`
-RPM_IS_EL8=`ls -ahl *-pr-*.rpm | grep el8 | wc -l`
+RPM_IS_EL7=`ls -ahl ${RPM_PREFIX}-pr-*.rpm | grep el7 | wc -l`
+RPM_IS_EL8=`ls -ahl ${RPM_PREFIX}-pr-*.rpm | grep el8 | wc -l`
 
 if [ $RPM_IS_EL7 -eq 1 ]
 then
   echo "====== Upload the packed RPM package for CentOS7 ======"
-  python3 rpm_upload_tools.py ${PULP3_REPO_NAME_EL7} ${PULP3_DIST_NAME_EL7} *-pr-*el7*.rpm
+  python3 rpm_upload_tools.py ${PULP3_REPO_NAME_EL7} ${PULP3_DIST_NAME_EL7} ${RPM_PREFIX}-pr-*el7*.rpm
 fi
 
 if [ $RPM_IS_EL8 -eq 1 ]
 then
   echo "====== Upload the packed RPM package for CentOS8 ======"
-  python3 rpm_upload_tools.py ${PULP3_REPO_NAME_EL8} ${PULP3_DIST_NAME_EL8} *-pr-*el8*.rpm
+  python3 rpm_upload_tools.py ${PULP3_REPO_NAME_EL8} ${PULP3_DIST_NAME_EL8} ${RPM_PREFIX}-pr-*el8*.rpm
 fi
 
 rm -rf *.rpm
\ No newline at end of file