Merge pull request #399 from ErikJiang/update_kylin_pkgs

Block the update repo from kylin os

build/os-packages/check_rebuild_pkgs.sh

@@ -14,11 +14,18 @@ ORG_NAME=${ORG_NAME:-""}
 # Get Latest Git Tag
 late_tag=`git tag --sort=committerdate -l | grep -o 'v.*' | tail -1`
 # Get Previous Git Tag (the one before the latest tag)
-prev_tag=`git tag --sort=committerdate -l | grep -o 'v.*' | tail -2 | head -1)`
+prev_tag=`git tag --sort=committerdate -l | grep -o 'v.*' | tail -2 | head -1`
 
 wget -c https://raw.githubusercontent.com/${ORG_NAME}/kubean/${late_tag}/build/os-packages/packages.yml -O late_packages.yml
 wget -c https://raw.githubusercontent.com/${ORG_NAME}/kubean/${prev_tag}/build/os-packages/packages.yml -O prev_packages.yml
 
+if [ "${OS_NAME}" == "kylinv10" ]; then
+  ret=`git diff ${prev_tag} ${late_tag} build/os-packages/repos/kylin.repo`
+  if [ ! -z "$ret" ]; then
+      echo "true" && exit 0
+  fi
+fi
+
 # centos7 / kylinv10 / redhat7 / redhat8
 if [ "${OS_NAME}" == "centos7" ] || [ "${OS_NAME}" == "kylinv10" ] || [ "${OS_NAME}" == "redhat7" ] || [ "${OS_NAME}" == "redhat8" ]; then
   late_digest=`yq eval ".yum[],.common[],.docker.${OS_NAME}[]" late_packages.yml | sort | sha1sum | awk '{print $1}'`

build/os-packages/repos/kylin.repo

@@ -7,17 +7,10 @@ enabled = 1
 sslverify=0
 gpgcheck = 0
 
-[ks10-adv-updates]
-name = Kylin Linux Advanced Server 10 - Updates
-baseurl = http://update.cs2c.com.cn:8080/NS/V10/V10SP2/os/adv/lic/updates/$basearch/
-enabled = 1
-sslverify=0
-gpgcheck = 0
-
-## `docker-ce-3:20.10` has dependencies on `fuse-overlayfs` and `slirp4netns` packages, which require `almalinux-extras` repo. ##
-# [almalinux-extras]
-# name=Almalinux extras - $basearch
-# baseurl=http://repo.almalinux.org/almalinux/8/AppStream/$basearch/os/
+## update repo will cause device-mapper package conflict problem, so block.
+# [ks10-adv-updates]
+# name = Kylin Linux Advanced Server 10 - Updates
+# baseurl = http://update.cs2c.com.cn:8080/NS/V10/V10SP2/os/adv/lic/updates/$basearch/
 # enabled = 1
 # sslverify=0
 # gpgcheck = 0