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

Keep images repository disabled on freeze command

Browse Source 
Fixes #2789
This commit is contained in:
Stephan Kulow 2022-04-01 10:25:02 +02:00
parent 1114fbdd30
commit 044f19b7dc
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osclib/freeze_command.py
View File

@ -28,7 +28,7 @@ class FreezeCommand(object):
f = self.api.retried_GET(url) f = self.api.retried_GET(url)
oldmeta = ET.parse(f).getroot() oldmeta = ET.parse(f).getroot()
meta = ET.fromstring(self.prj_meta_for_bootstrap_copy(self.prj)) meta = ET.fromstring(self.prj_meta_for_bootstrap_copy())
meta.find('title').text = oldmeta.find('title').text meta.find('title').text = oldmeta.find('title').text
meta.find('description').text = oldmeta.find('description').text meta.find('description').text = oldmeta.find('description').text
for person in oldmeta.findall('person'): for person in oldmeta.findall('person'):
@ -37,6 +37,9 @@ class FreezeCommand(object):
self.api.retried_PUT(url, ET.tostring(meta)) self.api.retried_PUT(url, ET.tostring(meta))
def is_images_disabled(self):
return self.api.get_flag_in_prj(self.prj, flag='build', repository='images') == 'disable'
def create_bootstrap_aggregate(self): def create_bootstrap_aggregate(self):
self.create_bootstrap_aggregate_meta() self.create_bootstrap_aggregate_meta()
self.create_bootstrap_aggregate_file() self.create_bootstrap_aggregate_file()
@ -144,8 +147,8 @@ class FreezeCommand(object):
# Set the original build status for the project # Set the original build status for the project
self.api.build_switch_prj(prj, build_status) self.api.build_switch_prj(prj, build_status)
def prj_meta_for_bootstrap_copy(self, prj): def prj_meta_for_bootstrap_copy(self):
root = ET.Element('project', {'name': prj}) root = ET.Element('project', {'name': self.prj})
ET.SubElement(root, 'title') ET.SubElement(root, 'title')
ET.SubElement(root, 'description') ET.SubElement(root, 'description')
links = self.projectlinks or ['{}:1-MinimalX'.format(self.api.crings)] links = self.projectlinks or ['{}:1-MinimalX'.format(self.api.crings)]
@ -158,7 +161,10 @@ class FreezeCommand(object):
ET.SubElement(f, 'disable') ET.SubElement(f, 'disable')
f = ET.SubElement(root, 'publish') f = ET.SubElement(root, 'publish')
ET.SubElement(f, 'disable') ET.SubElement(f, 'disable')
ET.SubElement(f, 'enable', {'repository': 'images'}) images_flag = 'enable'
if self.is_images_disabled():
images_flag = 'disable'
ET.SubElement(f, images_flag, {'repository': 'images'})
f = ET.SubElement(root, 'debuginfo') f = ET.SubElement(root, 'debuginfo')
ET.SubElement(f, 'enable') ET.SubElement(f, 'enable')
@ -169,15 +175,15 @@ class FreezeCommand(object):
a.text = arch a.text = arch
r = ET.SubElement(root, 'repository', {'name': 'standard', 'linkedbuild': 'all', 'rebuild': 'direct'}) r = ET.SubElement(root, 'repository', {'name': 'standard', 'linkedbuild': 'all', 'rebuild': 'direct'})
ET.SubElement(r, 'path', {'project': prj, 'repository': 'bootstrap_copy'}) ET.SubElement(r, 'path', {'project': self.prj, 'repository': 'bootstrap_copy'})
for arch in self.api.cstaging_archs: for arch in self.api.cstaging_archs:
a = ET.SubElement(r, 'arch') a = ET.SubElement(r, 'arch')
a.text = arch a.text = arch
r = ET.SubElement(root, 'repository', {'name': 'images', 'linkedbuild': 'all'}) r = ET.SubElement(root, 'repository', {'name': 'images', 'linkedbuild': 'all'})
ET.SubElement(r, 'path', {'project': prj, 'repository': 'standard'}) ET.SubElement(r, 'path', {'project': self.prj, 'repository': 'standard'})
if prj.startswith('SUSE:'): if self.prj.startswith('SUSE:'):
a = ET.SubElement(r, 'arch') a = ET.SubElement(r, 'arch')
a.text = 'local' a.text = 'local'
a = ET.SubElement(r, 'arch') a = ET.SubElement(r, 'arch')

3
tests/freeze_tests.py
View File

@ -27,10 +27,11 @@ class TestFreeze(OBSLocal.TestCase):
fc = FreezeCommand(wf.api) fc = FreezeCommand(wf.api)
fp = self._get_fixture_path('staging-meta-for-bootstrap-copy.xml') fp = self._get_fixture_path('staging-meta-for-bootstrap-copy.xml')
fc.prj = 'openSUSE:Factory:Staging:A'
fixture = subprocess.check_output('/usr/bin/xmllint --format %s' % fp, shell=True).decode('utf-8') fixture = subprocess.check_output('/usr/bin/xmllint --format %s' % fp, shell=True).decode('utf-8')
f = tempfile.NamedTemporaryFile(delete=False) f = tempfile.NamedTemporaryFile(delete=False)
f.write(fc.prj_meta_for_bootstrap_copy('openSUSE:Factory:Staging:A')) f.write(fc.prj_meta_for_bootstrap_copy())
f.close() f.close()
output = subprocess.check_output('/usr/bin/xmllint --format %s' % f.name, shell=True).decode('utf-8') output = subprocess.check_output('/usr/bin/xmllint --format %s' % f.name, shell=True).decode('utf-8')