From 710e65d8295ed38e4a4b4f125bbb2b0f6840399e Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Mon, 2 Aug 2021 10:25:18 +0800
Subject: [PATCH] add third repo for makeing iso

---
 script/setup_env.sh                | 3 ++-
 script/step/make_iso.sh            | 2 +-
 script/step/make_iso_everysrc.sh   | 2 +-
 script/step/make_iso_everything.sh | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/script/setup_env.sh b/script/setup_env.sh
index e2008ca..6999d5b 100644
--- a/script/setup_env.sh
+++ b/script/setup_env.sh
@@ -29,7 +29,8 @@ 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/standard_${ARCH}"
+export OBS_BRINGINRELY_URL=
+export OBS_STANDARD_THIRD_REPO_URL=
 
 
 export RELEASE_ROOT_PATH="/repo/openeuler/dailybuild"
diff --git a/script/step/make_iso.sh b/script/step/make_iso.sh
index 3ce4c2e..4977346 100644
--- a/script/step/make_iso.sh
+++ b/script/step/make_iso.sh
@@ -42,7 +42,7 @@ function make_iso_inchroot()
     set +u
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t standard -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL}"
+        bash -x oemaker -t standard -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
diff --git a/script/step/make_iso_everysrc.sh b/script/step/make_iso_everysrc.sh
index 5aa47f3..bc879a2 100644
--- a/script/step/make_iso_everysrc.sh
+++ b/script/step/make_iso_everysrc.sh
@@ -48,7 +48,7 @@ function make_iso_everysrc_inchroot()
     num=0
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t everything_src -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL}/standard_aarch64 ${OBS_STANDARD_REPO_URL}/standard_x86_64"
+        bash -x oemaker -t everything_src -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL}/standard_aarch64 ${OBS_STANDARD_REPO_URL}/standard_x86_64 ${OBS_STANDARD_THIRD_REPO_URL}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
diff --git a/script/step/make_iso_everything.sh b/script/step/make_iso_everything.sh
index 50cb898..2efdb41 100644
--- a/script/step/make_iso_everything.sh
+++ b/script/step/make_iso_everything.sh
@@ -49,7 +49,7 @@ function make_iso_everything_inchroot()
     num=0
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t everything -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL}"
+        bash -x oemaker -t everything -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
-- 
Gitee