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

publish bci repo right away on package set changes

Browse Source 
When there was a source commit on the bci repo, then the set of
packages changed, which likely means we need those changes to pass
the tests on the container release pipelines. So don't wait for 24h
but publish right away.

Also trigger on the oldest published state rather than the newest one
so that we do not need to wait another 24h per openQA failure to resume
publishing.
This commit is contained in:
Dirk Mueller 2024-01-03 14:14:15 +01:00
parent 6478168ac7
commit 4aa5565efc
No known key found for this signature in database
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gocd/bci_repo_publish.py
View File

@ -39,6 +39,16 @@ class BCIRepoPublisher(ToolBase.ToolBase):
raise RuntimeError(f"Failed to get version of {project}/{package}") raise RuntimeError(f"Failed to get version of {project}/{package}")
def srcmd5_of_product(self, project, package):
"""Get the srcmd5 of the given source package."""
# convert to the base package (without multibuild flavor)
package = package.partition(':')[0]
url = makeurl(self.apiurl, ['source', project, package])
root = ET.parse(http_GET(url)).getroot()
if root.tag == 'directory' and 'srcmd5' in root.attrib:
return root.attrib['srcmd5']
raise RuntimeError(f"Failed to get srcmd5 of {project}/{package}")
def mtime_of_product(self, project, package, repo, arch): def mtime_of_product(self, project, package, repo, arch):
"""Get the build time stamp of the given product, based on _buildenv.""" """Get the build time stamp of the given product, based on _buildenv."""
url = makeurl(self.apiurl, ['build', project, repo, arch, package]) url = makeurl(self.apiurl, ['build', project, repo, arch, package])
@ -104,12 +114,16 @@ class BCIRepoPublisher(ToolBase.ToolBase):
# After release, the BuildXXX part vanishes, so the mtime has to be # After release, the BuildXXX part vanishes, so the mtime has to be
# used instead for comparing built and published binaries. # used instead for comparing built and published binaries.
for pkg in packages: for pkg in packages:
pkg['built_version'] = self.version_of_product(pkg['build_prj'], pkg['name'], pkg['built_srcmd5'] = self.srcmd5_of_product(
'images', 'local') pkg['build_prj'], pkg['name'])
pkg['built_mtime'] = self.mtime_of_product(pkg['build_prj'], pkg['name'], pkg['published_srcmd5'] = self.srcmd5_of_product(
'images', 'local') pkg['publish_prj'], pkg['name'])
pkg['published_mtime'] = self.mtime_of_product(pkg['publish_prj'], pkg['name'], pkg['built_version'] = self.version_of_product(
'images', 'local') pkg['build_prj'], pkg['name'], 'images', 'local')
pkg['built_mtime'] = self.mtime_of_product(
pkg['build_prj'], pkg['name'], 'images', 'local')
pkg['published_mtime'] = self.mtime_of_product(
pkg['publish_prj'], pkg['name'], 'images', 'local')
# Verify that the builds for all archs are in sync # Verify that the builds for all archs are in sync
built_versions = {pkg['built_version'] for pkg in packages} built_versions = {pkg['built_version'] for pkg in packages}
@ -126,11 +140,17 @@ class BCIRepoPublisher(ToolBase.ToolBase):
return return
# If the last published build is less than a day old, don't publish # If the last published build is less than a day old, don't publish
newest_published_mtime = max([int(pkg['published_mtime']) for pkg in packages]) oldest_published_mtime = min([int(pkg['published_mtime']) for pkg in packages])
published_build_age_hours = int(time.time() - newest_published_mtime) // (60 * 60) published_disturls = {pkg['published_srcmd5'] for pkg in packages}
if published_build_age_hours < 24: published_build_age_hours = int(time.time() - oldest_published_mtime) // (60 * 60)
self.logger.info('Current published build less than a day old ' pending_source_changes = published_disturls.difference({pkg['built_srcmd5']for pkg in packages})
f'({published_build_age_hours}h).') if pending_source_changes:
self.logger.info(f"Pending source changes to published, skipping waiting for 24h: {pending_source_changes}")
# If the source commit different than the published version, we
# do not wait for 24h for a publish as there was a package addition or removal change
pass
elif published_build_age_hours < 24:
self.logger.info(f'Oldest published build is only {published_build_age_hours}h old, not publishing yet.')
return return
# Check openQA results # Check openQA results