Skip to content

Commit d6c2f57

Browse files
committed
Ensure S3 aritfact metadata gardenlinux_epoch remains a int
This commit ensures if a version is defined the major version number is used as `gardenlinux_epoch` Signed-off-by: Tobias Wolf <wolf@b1-systems.de> On-behalf-of: SAP <tobias.wolf@sap.com>
1 parent 34e1439 commit d6c2f57

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/gardenlinux/s3/s3_artifacts.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,12 @@ def upload_from_directory(
169169
if commit_id_or_hash is None:
170170
commit_id_or_hash = cname_object.commit_id
171171

172-
version_epoch = str(cname_object.version_epoch)
173-
174-
if version_epoch is None:
175-
version_epoch = ""
176-
177172
metadata = {
178173
"platform": cname_object.feature_set_platform,
179174
"architecture": arch,
180175
"base_image": None,
181176
"build_committish": commit_id_or_hash,
182177
"build_timestamp": datetime.fromtimestamp(release_timestamp).isoformat(),
183-
"gardenlinux_epoch": version_epoch,
184178
"logs": None,
185179
"modifiers": feature_set_list,
186180
"require_uefi": require_uefi,
@@ -193,6 +187,9 @@ def upload_from_directory(
193187
"paths": [],
194188
}
195189

190+
if cname_object.version_epoch is not None:
191+
metadata["gardenlinux_epoch"] = cname_object.version_epoch
192+
196193
platform_variant = cname_object.platform_variant
197194

198195
if platform_variant is not None:

tests/s3/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
base_image: null
1818
build_committish: abc123lo
1919
build_timestamp: '{build_timestamp}'
20-
gardenlinux_epoch: '1234'
2120
logs: null
2221
modifiers:
2322
- _usi
@@ -36,4 +35,5 @@
3635
suffix: .release
3736
md5sum: {md5sum}
3837
sha256sum: {sha256sum}
38+
gardenlinux_epoch: 1234
3939
""".strip()

0 commit comments

Comments
 (0)