diff --git a/script/setup_env.sh b/script/setup_env.sh index e2008ca4518af78cc32e7e85b78ff012959accf3..6999d5b3ff550032ed1bdf9f9d0c4448fba1087a 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 3ce4c2e7f7213c42b5c088f811f87c63dfa17700..497734604cd760cbd16f37f47bc2cc79c9ab58a2 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 5aa47f3ece079d9e959dc99d9cc937b2b72d6a60..bc879a2b469c29dc4a815597a08432234025c210 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 50cb898a939245fe1b6d5c8ac5149b3efe6c5de8..2efdb41001d377f93e58d9991b30bb112c49fe6c 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