yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

random fixes

Browse Source
This commit is contained in:
Stephan Kulow 2014-05-18 21:42:54 +02:00
parent b5925fd033
commit 3a4dcdce6b
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
create_test_dvd-1.testcase
View File

@ -29,3 +29,4 @@ job lock name readline-doc
job lock name SuSEfirewall2
job lock name vim-data
job lock name libgcc_s1-32bit
job lock name gettext-runtime-mini

6
create_test_dvd-2.testcase
View File

@ -32,3 +32,9 @@ job install name xdelta
job lock name gtk2-branding-upstream
job lock name readline-doc
job lock name libgcc_s1-32bit
job lock name openvpn
job lock name systemtap
job lock name esound-daemon
job lock name gettext-runtime-mini

14
create_test_dvds.sh
View File

@ -58,9 +58,15 @@ sync_prj openSUSE:Factory:Rings:1-MinimalX/standard minimalx
regenerate_pl openSUSE:Factory:Rings:1-MinimalX 1 bootstrap minimalx
sync_prj openSUSE:Factory:Rings:2-TestDVD/standard testdvd
regenerate_pl openSUSE:Factory:Rings:2-TestDVD 2 bootstrap minimalx testdvd
sync_prj openSUSE:Factory:Staging:A/standard staging_A
regenerate_pl "openSUSE:Factory:Staging:A" 1 staging_A
sync_prj openSUSE:Factory:Staging:A:DVD/standard staging_A-dvd
regenerate_pl "openSUSE:Factory:Staging:A:DVD" 2 staging_A staging_A-dvd
for l in B C D E F G H I J; do
sync_prj openSUSE:Factory:Staging:$l/bootstrap_copy "staging_$l-bc"
sync_prj openSUSE:Factory:Staging:$l/standard staging_$l
@ -68,16 +74,10 @@ for l in B C D E F G H I J; do
done
projects=$(osc api /search/project/id?match='starts-with(@name,"openSUSE:Factory:Staging")' | grep :DVD | cut -d\" -f2)
for prj in openSUSE:Factory:Rings:2-TestDVD $projects; do
for prj in openSUSE:Factory:Rings:2-TestDVD $projects; do
perl $SCRIPTDIR/rebuildpacs.pl $prj standard x86_64
done
sync_prj openSUSE:Factory:Rings:2-TestDVD/standard testdvd
regenerate_pl openSUSE:Factory:Rings:2-TestDVD 2 bootstrap minimalx testdvd
sync_prj openSUSE:Factory:Staging:A:DVD/standard staging_A-dvd
regenerate_pl "openSUSE:Factory:Staging:A:DVD" 2 staging_A staging_A-dvd
for l in B C D E F G H I; do
sync_prj openSUSE:Factory:Staging:$l:DVD/standard "staging_$l-dvd"
regenerate_pl "openSUSE:Factory:Staging:$l:DVD" 2 "staging_$l-bc" staging_$l "staging_$l-dvd"

6
osc-check_repo.py
View File

@ -737,9 +737,9 @@ def _check_repo_download(self, p, opts):
todownload.append(('x86_64', fn[0], fn[3]))
# now fetch -32bit packs
for fn in self._check_repo_repo_list(p.sproject, repo, 'i586', p.spackage, opts):
if fn[2] == 'x86_64':
todownload.append(('i586', fn[0], fn[3]))
#for fn in self._check_repo_repo_list(p.sproject, repo, 'i586', p.spackage, opts):
# if fn[2] == 'x86_64':
# todownload.append(('i586', fn[0], fn[3]))
p.downloads[repo] = []
for arch, fn, mt in todownload:

2
osclib/stagingapi.py
View File

@ -679,7 +679,7 @@ class StagingAPI(object):
for module in openqa['testmodules']:
# zypper_in fails at the moment - urgent fix needed
if module['result'] == 'ok': continue
if module['name'] in ['inkscape', 'gnucash', 'kate', 'thunderbird']:
if module['name'] in []:
continue
return "{} test failed: {}".format(module['name'], job['id'])
return None