From 8ee6e363a274d4ab803d888af4a9cbb6301fa180 Mon Sep 17 00:00:00 2001 From: Eike Waldt Date: Thu, 10 Jul 2025 08:05:00 +0200 Subject: [PATCH 1/2] make suffix in s3 artifact manifest not contain cname to parse this correctly in GLCI --- src/gardenlinux/s3/s3_artifacts.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gardenlinux/s3/s3_artifacts.py b/src/gardenlinux/s3/s3_artifacts.py index b0eabdbf..a37ca7ba 100644 --- a/src/gardenlinux/s3/s3_artifacts.py +++ b/src/gardenlinux/s3/s3_artifacts.py @@ -169,11 +169,18 @@ def upload_from_directory( md5sum = file_digest(fp, "md5").hexdigest() sha256sum = file_digest(fp, "sha256").hexdigest() + if artifact.name.startswith(cname): + suffix = artifact.name[len(cname) :] + else: + raise RuntimeError( + f"Artifact name '{artifact.name}' does not start with cname '{cname}'" + ) + artifact_metadata = { "name": artifact.name, "s3_bucket_name": self._bucket.name, "s3_key": s3_key, - "suffix": "".join(artifact.suffixes), + "suffix": suffix, "md5sum": md5sum, "sha256sum": sha256sum, } From 7ab35e35480bcfc570eacf33d1ceb04cd12ecd52 Mon Sep 17 00:00:00 2001 From: Eike Waldt Date: Thu, 10 Jul 2025 08:06:21 +0200 Subject: [PATCH 2/2] github actions: bump default version to 0.8.3 --- .github/actions/features_parse/action.yml | 2 +- .github/actions/flavors_parse/action.yml | 2 +- .github/actions/setup/action.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/features_parse/action.yml b/.github/actions/features_parse/action.yml index f3a348fe..70a403fb 100644 --- a/.github/actions/features_parse/action.yml +++ b/.github/actions/features_parse/action.yml @@ -11,7 +11,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.2 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3 - id: result shell: bash run: | diff --git a/.github/actions/flavors_parse/action.yml b/.github/actions/flavors_parse/action.yml index caab74d3..38c3d539 100644 --- a/.github/actions/flavors_parse/action.yml +++ b/.github/actions/flavors_parse/action.yml @@ -13,7 +13,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.2 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.3 - id: matrix shell: bash run: | diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 527824d8..8c290c36 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library inputs: version: description: GardenLinux Python library version - default: "0.8.2" + default: "0.8.3" runs: using: composite steps: