From: y0169.zhang Date: Thu, 12 Jan 2017 05:50:54 +0000 (+0900) Subject: Modify repo server ip from Nanjing to HQ X-Git-Tag: submit/devel/20190730.074552~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97ffe09dcf736d4c36e9bf522ea7ef5f7858d789;p=tools%2Fitest-cases-gbs.git Modify repo server ip from Nanjing to HQ Change-Id: I921e2c86565cd2db2ea51a9d9f7ee1cd960603a2 --- diff --git a/cases/build/test_build_as_root.case b/cases/build/test_build_as_root.case index ae6fea2..489fbec 100644 --- a/cases/build/test_build_as_root.case +++ b/cases/build/test_build_as_root.case @@ -20,20 +20,20 @@ sudo /bin/rm -rf /root/GBS-ROOT/local/repos cp base.cfg /var/tmp/ -#ssh root@localhost gbs -c /var/tmp/base.cfg build -A i586 --skip-conf-repos -R http://109.123.123.185/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --clean /var/tmp/fake +#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://109.123.123.185/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://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://109.123.123.185/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/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://109.123.123.185/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://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://109.123.123.185/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://10.113.136.109/repo/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 4590e57..95c36c5 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://109.123.123.185/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://10.113.136.109/repo/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 5f1066b..df8d25f 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://109.123.123.185/forGBS/download.tizen.org/releases/2.2.1/latest -A i586 2>&1 |tee log +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 test -n "`grep "releases/2.2/latest" log`" diff --git a/cases/build/test_build_user_passwd_ia32.case b/cases/build/test_build_user_passwd_ia32.case index 0ca9d95..52de15c 100644 --- a/cases/build/test_build_user_passwd_ia32.case +++ b/cases/build/test_build_user_passwd_ia32.case @@ -16,7 +16,7 @@ sudo /bin/rm -rf $GBS_LOCAL_REPOS ./create_proj fake.spec -gbs -c base.cfg build -R http://test:123456@109.123.123.185/repo-protected/tizen/releases/2.2/latest --skip-conf-repos --clean -A i586 2>&1| tee log +gbs -c base.cfg build -R http://test:123456@10.113.136.109/repo-protected/tizen/releases/2.2/latest --skip-conf-repos --clean -A i586 2>&1| tee log (! grep "init_buildsystem.*123456" log) diff --git a/fixtures/conf/base.cfg b/fixtures/conf/base.cfg index 6256f29..0cf8861 100644 --- a/fixtures/conf/base.cfg +++ b/fixtures/conf/base.cfg @@ -18,50 +18,50 @@ user = obs_viewer passwd = obs_viewer [repo.tizen_latest] -url = http://109.123.123.185/repo/download.tizen.org/releases/2.2/latest/ +url = http://10.113.136.109/repo/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://109.123.123.185/repo/download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ +url = http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ [profile.tizen_base] repos = repo.tizen_base [repo.tizen_base] -url = http://109.123.123.185/repo/download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ +url = http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ [profile.tizen_ivi] repos = repo.tizen_ivi [repo.tizen_ivi] -url = http://109.123.123.185/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ +url = http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ [profile.tizen_negative1] repos = repo.tizen_negative1 [repo.tizen_negative1] #there is no in repomd.xml -url = http://109.123.123.185/negativ_1_gbs/packages/ +url = http://10.113.136.109/negativ_1_gbs/packages/ [profile.tizen_negative2] repos = repo.tizen_negative2 [repo.tizen_negative2] #there is no f113ca67a6b9f572cdbd1bacf3e7364b685dbb7f9f79bf43ca2a55df3c84ff9e-build.conf.gz defined by repomd.xml in repodata -url = http://109.123.123.185/negativ_2_gbs/repos/atom/i586/packages/ +url = http://10.113.136.109/negativ_2_gbs/repos/atom/i586/packages/ [profile.tizen_negative3] repos = repo.tizen_negative3 [repo.tizen_negative3] #new structure repo -url = http://109.123.123.185/negativ_3_gbs/ +url = http://10.113.136.109/negativ_3_gbs/ [profile.tizen_without_conf] repos = repo.tizen_without_conf [repo.tizen_without_conf] #there is no builddata under latest directory -url = http://109.123.123.185/without_conf_gbs/ +url = http://10.113.136.109/without_conf_gbs/ diff --git a/fixtures/conf/inherit_only_passwdx.cfg b/fixtures/conf/inherit_only_passwdx.cfg index a80264b..d935a56 100644 --- a/fixtures/conf/inherit_only_passwdx.cfg +++ b/fixtures/conf/inherit_only_passwdx.cfg @@ -7,7 +7,7 @@ repos = repo.tizen passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== [repo.tizen] -url = http://109.123.123.185/repo-protected/tizen/releases/2.2/latest +url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest user = test [obs.tizen] diff --git a/fixtures/conf/inherit_only_user.cfg b/fixtures/conf/inherit_only_user.cfg index 0ad2afc..5e6e4e6 100644 --- a/fixtures/conf/inherit_only_user.cfg +++ b/fixtures/conf/inherit_only_user.cfg @@ -7,5 +7,5 @@ repos = repo.tizen user = test [repo.tizen] -url = http://109.123.123.185/repo-protected/tizen/releases/2.2/latest +url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== diff --git a/fixtures/conf/invalid_user.cfg b/fixtures/conf/invalid_user.cfg index 9904f1d..694c92b 100644 --- a/fixtures/conf/invalid_user.cfg +++ b/fixtures/conf/invalid_user.cfg @@ -2,7 +2,7 @@ profile = profile.current [repo.repo1] -url=http://109.123.123.185/repo-protected/tizen/releases/2.2/latest +url=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest user = invaliduser passwdx = QlpoOTFBWSZTWbwQMfEAAACZgAABOkAggQAgIAAiAaHqEAMFtNawA8XckU4UJC8EDHxA diff --git a/fixtures/conf/only_passwdx_no_user.cfg b/fixtures/conf/only_passwdx_no_user.cfg index 666783a..ff110d9 100644 --- a/fixtures/conf/only_passwdx_no_user.cfg +++ b/fixtures/conf/only_passwdx_no_user.cfg @@ -7,4 +7,4 @@ repos = repo.tizen passwdx = QlpoOTFBWSZTWdgiTvYAAASZAAAEcAASEiAAMQwIIDaI2JGSHi7kinChIbBEnew= [repo.tizen] -url = http://109.123.123.185/repo-protected/tizen/releases/2.2/latest +url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest diff --git a/fixtures/conf/plaintext_password_issue.cfg b/fixtures/conf/plaintext_password_issue.cfg index 7e6b173..298bf57 100644 --- a/fixtures/conf/plaintext_password_issue.cfg +++ b/fixtures/conf/plaintext_password_issue.cfg @@ -6,7 +6,7 @@ tmpdir = /var/tmp repos = repo.tizen [repo.tizen] -url = http://109.123.123.185/repo-protected/tizen/releases/2.2/latest +url = http://10.113.136.109/repo-protected/tizen/releases/2.2/latest user = test passwdx = QlpoOTFBWSZTWScPk3AAAAAIAD8AIAAhgAwDJy7i7kinChIE4fJuAA== diff --git a/fixtures/tools/assert b/fixtures/tools/assert index 82f249e..fabbbb0 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://109.123.123.185/repo/download.tizen.org/releases/2.2/latest'} +: ${GBS_REPOURL:='http://10.113.136.109/repo/download.tizen.org/releases/2.2/latest'} #assert git packages under current dir are clean