always use <epoch>-<commit-hash> for single flavour manifests
@@ -82,10 +82,15 @@ def upload_results_step(
print(f'uploading to s3 {aws_cfg_name=} {s3_bucket_name=}')
gardenlinux_epoch = int(gardenlinux_epoch)
+ # always use <epoch>-<commit-hash> as version
+ # -> version denotes the intended, future release version, which is only relevant for marking
+ # a flavourset as actually being released
+ upload_version = f'{gardenlinux_epoch}-{committish[:6]}'
+
uploaded_relpaths = tuple(upload_files(
build_result_fname=build_result_fname,
fname_prefix=fnameprefix,
- version_str=version,
+ version_str=upload_version,
s3_client=s3_client,
s3_bucket_name=s3_bucket_name,
))
@@ -98,7 +103,7 @@ def upload_results_step(
# add manifest (to be able to identify all relevant artifacts later)
manifest = glci.model.ReleaseManifest(
build_committish=committish,
- version=version,
+ version=upload_version,
build_timestamp=datetime.datetime.now().isoformat(),
gardenlinux_epoch=gardenlinux_epoch,
architecture=glci.model.Architecture(architecture).value,
