From: jingui.ren Date: Thu, 18 Apr 2019 07:47:44 +0000 (+0800) Subject: use public download url instead of spin download url X-Git-Tag: submit/devel/20190730.074552~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f8b46c9bdbbd9a75dc0b372e88ecedad4ab6269;p=tools%2Fitest-cases-gbs.git use public download url instead of spin download url Change-Id: I2fbe8b300b3a2fcadebff461cc5fd4eb2b2a0d29 --- diff --git a/cases/build/test_build_as_root.case b/cases/build/test_build_as_root.case index 489fbec..56175a2 100644 --- a/cases/build/test_build_as_root.case +++ b/cases/build/test_build_as_root.case @@ -22,18 +22,18 @@ cp base.cfg /var/tmp/ #ssh root@localhost gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake -sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ --clean /var/tmp/fake" +sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ --clean /var/tmp/fake" -#sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake" +#sudo su -l root -c "gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake" test -n "`sudo find /root/GBS-ROOT/local/repos -name '*fake*.rpm'`" rm -rf ~/GBS-ROOT/local/repos -gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ --clean /var/tmp/fake +gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ --clean /var/tmp/fake -#gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake +#gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake test -n "`find ~/GBS-ROOT/local/repos -name '*fake*.rpm'`" ]]> diff --git a/cases/build/test_build_skip-conf-repos_ia32.case b/cases/build/test_build_skip-conf-repos_ia32.case index 95c36c5..c25c25d 100644 --- a/cases/build/test_build_skip-conf-repos_ia32.case +++ b/cases/build/test_build_skip-conf-repos_ia32.case @@ -18,7 +18,7 @@ sudo /bin/rm -rf $GBS_ROOT_I686_0 ./create_proj fake.spec -gbs -c base.cfg build --skip-conf-repos -R http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ -A i586 2>&1 |tee log +gbs -c base.cfg build --skip-conf-repos -R http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ -A i586 2>&1 |tee log #test -n "`grep "ivi/latest/repos/atom/packages" log`" test -n "`grep "repos/tizen-base/ia32/packages" log`" diff --git a/cases/build/test_build_skip-conf-repos_nagetive.case b/cases/build/test_build_skip-conf-repos_nagetive.case index df8d25f..834027b 100644 --- a/cases/build/test_build_skip-conf-repos_nagetive.case +++ b/cases/build/test_build_skip-conf-repos_nagetive.case @@ -18,7 +18,7 @@ sudo /bin/rm -rf $GBS_ROOT_I686_0 ./create_proj fake.spec -gbs -c base.cfg build -R http://10.113.136.109/forGBS/download.tizen.org/releases/2.2.1/latest -A i586 2>&1 |tee log +gbs -c base.cfg build -R http://download.tizen.org/releases/2.2.1/latest -A i586 2>&1 |tee log test -n "`grep "releases/2.2/latest" log`" diff --git a/fixtures/conf/base.cfg b/fixtures/conf/base.cfg index 0cf8861..edc1883 100644 --- a/fixtures/conf/base.cfg +++ b/fixtures/conf/base.cfg @@ -18,25 +18,25 @@ user = obs_viewer passwd = obs_viewer [repo.tizen_latest] -url = http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/ +url = http://download.tizen.org/releases/2.2/latest/ ; optinal user/passwd, set if differ from proflie's user/passwd #user = #passwdx = [repo.tizen_main] -url = http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ +url = http://download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ [profile.tizen_base] repos = repo.tizen_base [repo.tizen_base] -url = http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ +url = http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ [profile.tizen_ivi] repos = repo.tizen_ivi [repo.tizen_ivi] -url = http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ +url = http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ [profile.tizen_negative1] repos = repo.tizen_negative1 diff --git a/fixtures/conf/general_obs_user_passwd.cfg b/fixtures/conf/general_obs_user_passwd.cfg index ad8b891..53971c7 100644 --- a/fixtures/conf/general_obs_user_passwd.cfg +++ b/fixtures/conf/general_obs_user_passwd.cfg @@ -15,4 +15,4 @@ passwd=${passwd} repos = repo.repo1 [repo.repo1] -url = http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/ +url = http://download.tizen.org/releases/2.2/latest/ diff --git a/fixtures/conf/recommends.cfg b/fixtures/conf/recommends.cfg index 58bd00f..9b16080 100644 --- a/fixtures/conf/recommends.cfg +++ b/fixtures/conf/recommends.cfg @@ -6,4 +6,4 @@ repos = repo.1, repo.2 [repo.1] url = http://10.113.136.109/Tizen:/TestPrograms/emulator32/ [repo.2] -url = http://10.113.136.109/tizen/3.0-base/latest/repos/emulator32/packages/ +url = http://download.tizen.org/releases/milestone/tizen/3.0-base/latest/repos/emulator32/packages/ diff --git a/fixtures/conf/tizen30.cfg b/fixtures/conf/tizen30.cfg index 2a257bb..93edaa7 100644 --- a/fixtures/conf/tizen30.cfg +++ b/fixtures/conf/tizen30.cfg @@ -4,6 +4,6 @@ fallback_to_native = true [profile.tizen_mobile] repos = repo.1, repo.2 [repo.1] -url = http://10.113.136.109/tizen/3.0-base/latest/repos/emulator32/packages/ +url = http://download.tizen.org/snapshots/tizen/3.0-base/latest/repos/emulator32/packages/ [repo.2] url = http://download.tizen.org/snapshots/tizen/3.0-mobile/latest/repos/emulator32-wayland/packages/ diff --git a/fixtures/tools/assert b/fixtures/tools/assert index fabbbb0..8fa1a13 100644 --- a/fixtures/tools/assert +++ b/fixtures/tools/assert @@ -8,7 +8,7 @@ GBS_RPMS_ARMV7L=~/GBS-ROOT/local/repos/tizen/armv7l/RPMS GBS_SRPMS_ARMV7L=~/GBS-ROOT/local/repos/tizen/armv7l/SRPMS GBS_LOCAL_REPOS=~/GBS-ROOT/local/repos # define default value for GBS_REPOURL if it is null or not defined -: ${GBS_REPOURL:='http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest'} +: ${GBS_REPOURL:='http://download.tizen.org/releases/2.2/latest'} #assert git packages under current dir are clean