From 80affdb08d97e1d1886550fe7e3461eb70fb832d Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Wed, 24 Feb 2021 17:52:15 +0800
Subject: [PATCH] change method for getting epol rpms

---
 script/setup_env.sh          |  2 +-
 script/step/get_epol_rpms.sh | 40 +++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/script/setup_env.sh b/script/setup_env.sh
index 322ba15..24df1b1 100644
--- a/script/setup_env.sh
+++ b/script/setup_env.sh
@@ -20,7 +20,7 @@ SUB_EXTRAS_REPO_URL="$(echo ${OBS_EXTRAS_PROJECT//:/:\/})"
 export OBS_STANDARD_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_STANDARD_REPO_URL}/standard_${ARCH}"
 export OBS_EPOL_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_EPOL_REPO_URL}/standard_${ARCH}"
 export OBS_EXTRAS_REPO_URL="http://${OBS_SERVER_IP}:82/${SUB_EXTRAS_REPO_URL}/standard_${ARCH}"
-export OBS_BRINGINRELY_URL="http://${OBS_SERVER_IP}:88/bringInRely"
+export OBS_BRINGINRELY_URL="http://${OBS_SERVER_IP}:88/bringInRely/standard_${ARCH}"
 
 export RELEASE_ROOT_PATH="/repo/openeuler/dailybuild"
 export RELEASE_VERSION_DIR="${OS_NAME}-${OS_VERSION}"
diff --git a/script/step/get_epol_rpms.sh b/script/step/get_epol_rpms.sh
index 76c341d..9afc812 100644
--- a/script/step/get_epol_rpms.sh
+++ b/script/step/get_epol_rpms.sh
@@ -28,22 +28,34 @@ function get_epol_rpms_inchroot()
     TIME=${TIME#"${version}"-}
     CUSTOM_DIR="${TIME_DIR}"
     set +e
-    RELEASE_DIR="${release_dir}/EPOL/$ARCH/Packages"
-    RELEASE_SOURCE_DIR="${release_dir}/EPOL/source/Packages"
+    mv /etc/yum.repos.d /etc/yum.repos.d.bak
+    mkdir -p /etc/yum.repos.d /tmp/EPOL/${ARCH}/Packages "/tmp/EPOL/source/Packages"
+    yum-config-manager --add-repo "${OBS_EPOL_REPO_URL}" --add-repo "${OBS_BRINGINRELY_URL}"
+    yum clean all
+    RELEASE_DIR="${release_dir}/EPOL"
     SSH_CMD="mkdir -p ${RELEASE_DIR}"
     sshcmd "${SSH_CMD}"
-    SSH_CMD="mkdir -p ${RELEASE_SOURCE_DIR}"
-    sshcmd "${SSH_CMD}"
-    SSH_CMD="cd ${RELEASE_DIR} && wget -c -r -np -nd ${OBS_EPOL_REPO_URL}/${ARCH}/ && rm -rf ${ARCH} && rm -rf index.html*"
-    sshcmd "${SSH_CMD}"
-    SSH_CMD="cd ${RELEASE_DIR} && wget -c -r -np -nd ${OBS_EPOL_REPO_URL}/noarch/ && rm -rf noarch && rm -rf index.html*"
-    sshcmd "${SSH_CMD}"
-    SSH_CMD="cd ${RELEASE_SOURCE_DIR} && wget -c -r -np -nd ${OBS_EPOL_REPO_URL}/src/ && rm -rf src && rm -rf index.html*"
-    sshcmd "${SSH_CMD}"
-    SSH_CMD="cd ${RELEASE_DIR} && wget -c -r -np -nd ${OBS_BRINGINRELY_URL}/${ARCH}/ && rm -rf ${ARCH} && rm -rf index.html*"
-    sshcmd "${SSH_CMD}"
+
+    yum list --installroot="/tmp/EPOL/aarch64/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v ".src" > ava_epol_lst
+
+    yumdownloader --installroot="/tmp/EPOL/${ARCH}/Packages" --destdir="/tmp/EPOL/${ARCH}/Packages" $(cat ava_epol_lst | tr '\n' ' ')
+    rm -rf /tmp/EPOL/${ARCH}/Packages/var
+    createrepo -d /tmp/EPOL/${ARCH}
+    sshscp "/tmp/EPOL/${ARCH}" "${RELEASE_DIR}"
+    if [[ "$ARCH" == "aarch64" ]];then
+        rm -rf /etc/yum.repos.d/*
+        yum-config-manager --add-repo "${OBS_EPOL_REPO_URL}"
+        yum clean all
+        yum list --installroot="/tmp/EPOL/aarch64/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v ".src" > ava_epol_lst
+        yumdownloader --installroot="/tmp/EPOL/source/Packages" --destdir="/tmp/EPOL/source/Packages" --source $(cat ava_epol_lst | tr '\n' ' ')
+        rm -rf /tmp/EPOL/source/Packages/var
+        createrepo -d /tmp/EPOL/source
+        sshscp "/tmp/EPOL/source" "${RELEASE_DIR}"
+    fi
+    rm -rf /tmp/EPOL
+    rm -rf /etc/yum.repos.d
+    mv /etc/yum.repos.d.bak /etc/yum.repos.d
     set -e
-    SSH_CMD="cd ${release_dir} && createrepo -d ${release_dir}/EPOL/$ARCH; createrepo -d ${release_dir}/EPOL/source"
-    sshcmd "${SSH_CMD}"
+
     return 0
 }
-- 
Gitee