TSG-9938: 适配rocky linux8.5v4.2.81

4 files changed, 52 insertions, 1 deletions

diff --git a/ci/envelope_rpm.sh b/ci/envelope_rpm.sh
new file mode 100644
index 0000000..24ffea4
--- /dev/null
+++ b/ci/envelope_rpm.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+ls $CI_PROJECT_DIR/build/*.rpm
+
+BIN_TO_PROTECT_IN_RPM="${INSTALL_PREFIX}/sapp"
+RPMS_FULL_PATH=`ls $CI_PROJECT_DIR/build/*.rpm | grep -v debug | grep -v devel`
+echo "RPMS_TO_BE_ENVELOPE: " $RPMS_FULL_PATH
+
+for RPM in ${RPMS_FULL_PATH[@]}
+do
+  echo "ENVELOPE: " $RPM
+  /root/rebuildrpm_and_envelope.sh $RPM $BIN_TO_PROTECT_IN_RPM $FEATURE_ID $APP_NAME_IN_RPM_SPEC
+done
\ No newline at end of file
diff --git a/ci/travis.sh b/ci/travis.sh
index e5dcdc5..d1bb6d7 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -40,10 +40,13 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
 	source /etc/profile.d/framework.sh
 fi
 
-if [ $ASAN_OPTION ];then
+if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ] ;then
 	source /opt/rh/devtoolset-7/enable
 fi
 
+if [ -f "/usr/lib64/libnsl.so.1" ]; then
+    cd /usr/lib64/; ln -fs libnsl.so.1 libnsl.so; cd -
+fi
 /usr/bin/xxd -v
 
 mkdir build || true
diff --git a/ci/update-el8-repo.sh b/ci/update-el8-repo.sh
new file mode 100644
index 0000000..9b124c3
--- /dev/null
+++ b/ci/update-el8-repo.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+rpm -e epel-release
+
+yum install epel-release -y
+dnf info epel-release
+dnf install 'dnf-command(config-manager)' -y
+dnf config-manager --set-enabled PowerTools
+dnf update --skip-broken --nobest -y
+dnf repolist
+dnf --disablerepo="*" --enablerepo="epel" install libunwind -y
+dnf  install gperftools  -y
\ No newline at end of file
diff --git a/ci/upload_enveloped_rpm.sh b/ci/upload_enveloped_rpm.sh
new file mode 100644
index 0000000..dd10318
--- /dev/null
+++ b/ci/upload_enveloped_rpm.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+cd $CI_PROJECT_DIR/build/
+cp ~/rpm_upload_tools.py ./
+
+ls -ahl *.rpm
+
+RPM_IS_EL7=`ls -ahl *-pr-*.rpm | grep el7 | wc -l`
+RPM_IS_EL8=`ls -ahl *-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
+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
+fi
+
+rm -rf *.rpm
\ No newline at end of file