Skip to content

Commit 2fc5f13

Browse files
committed
Add support to publishing_group to S3 artifacts handling
Signed-off-by: Tobias Wolf <wolf@b1-systems.de> On-behalf-of: <tobias.wolf@sap.com>
1 parent 8c5c65e commit 2fc5f13

55 files changed

Lines changed: 61 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/gardenlinux/s3/s3_artifacts.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ def upload_from_directory(
148148

149149
arch = cname_object.arch
150150
feature_set_list = cname_object.feature_set_list
151+
publishing_group = ""
151152
release_timestamp = stat(release_file).st_ctime
152153
requirements_file = artifacts_dir.joinpath(f"{base_name}.requirements")
153154
require_uefi = None
@@ -161,6 +162,11 @@ def upload_from_directory(
161162
if requirements_config.has_option(UNNAMED_SECTION, "arch"):
162163
arch = requirements_config.get(UNNAMED_SECTION, "arch")
163164

165+
if requirements_config.has_option(UNNAMED_SECTION, "publishing_group"):
166+
publishing_group = requirements_config.get(
167+
UNNAMED_SECTION, "publishing_group"
168+
)
169+
164170
if requirements_config.has_option(UNNAMED_SECTION, "uefi"):
165171
require_uefi = requirements_config.getboolean(UNNAMED_SECTION, "uefi")
166172

@@ -202,6 +208,7 @@ def upload_from_directory(
202208
"build_timestamp": datetime.fromtimestamp(release_timestamp),
203209
"logs": None,
204210
"modifiers": feature_set_list,
211+
"publishing_group": publishing_group,
205212
"require_uefi": require_uefi,
206213
"secureboot": secureboot,
207214
"tpm2": tpm2,

test-data/release_notes/s3_bucket_artifacts/ali-gardener_prod-amd64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ published_image_metadata:
180180
- image_id: m-gw86dlqmpaugljiykx91
181181
image_name: gardenlinux-ali-gardener_prod-amd64-1877.3-75df9f40
182182
region_id: eu-central-1
183+
publishing_group: ''
183184
require_uefi: false
184185
s3_bucket: gardenlinux-github-releases
185186
s3_key: meta/singles/ali-gardener_prod-amd64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/aws-gardener_prod-amd64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ published_image_metadata:
159159
- ami_id: ami-05e1cc73d997d67b7
160160
aws_region_id: cn-northwest-1
161161
image_name: gardenlinux-aws-gardener_prod-amd64-1877.3-75df9f40
162+
publishing_group: ''
162163
require_uefi: false
163164
s3_bucket: gardenlinux-github-releases
164165
s3_key: meta/singles/aws-gardener_prod-amd64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/aws-gardener_prod-arm64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ published_image_metadata:
147147
- ami_id: ami-06fc0f74b500d2d82
148148
aws_region_id: cn-northwest-1
149149
image_name: gardenlinux-aws-gardener_prod-arm64-1877.3-75df9f40
150+
publishing_group: ''
150151
require_uefi: false
151152
s3_bucket: gardenlinux-github-releases
152153
s3_key: meta/singles/aws-gardener_prod-arm64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/aws-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ published_image_metadata:
257257
- ami_id: ami-005f7dab618420a91
258258
aws_region_id: eu-central-1
259259
image_name: gardenlinux-aws-gardener_prod_tpm2_trustedboot-amd64-1877.3-75df9f40
260+
publishing_group: ''
260261
require_uefi: true
261262
s3_bucket: gardenlinux-github-releases
262263
s3_key: meta/singles/aws-gardener_prod_tpm2_trustedboot-amd64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/aws-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ published_image_metadata:
269269
- ami_id: ami-0b15b442dd5e90d50
270270
aws_region_id: eu-central-1
271271
image_name: gardenlinux-aws-gardener_prod_tpm2_trustedboot-arm64-1877.3-75df9f40
272+
publishing_group: ''
272273
require_uefi: true
273274
s3_bucket: gardenlinux-github-releases
274275
s3_key: meta/singles/aws-gardener_prod_tpm2_trustedboot-arm64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/aws-gardener_prod_usi-amd64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ published_image_metadata:
185185
- ami_id: ami-0cab977e76e274599
186186
aws_region_id: cn-northwest-1
187187
image_name: gardenlinux-aws-gardener_prod_usi-amd64-1877.3-75df9f40
188+
publishing_group: ''
188189
require_uefi: true
189190
s3_bucket: gardenlinux-github-releases
190191
s3_key: meta/singles/aws-gardener_prod_usi-amd64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/aws-gardener_prod_usi-arm64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ published_image_metadata:
173173
- ami_id: ami-0a7fe5959bb23fab8
174174
aws_region_id: cn-northwest-1
175175
image_name: gardenlinux-aws-gardener_prod_usi-arm64-1877.3-75df9f40
176+
publishing_group: ''
176177
require_uefi: true
177178
s3_bucket: gardenlinux-github-releases
178179
s3_key: meta/singles/aws-gardener_prod_usi-arm64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/azure-gardener_prod-amd64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ published_image_metadata:
9797
community_gallery_image_id: /CommunityGalleries/gardenlinux-8e6518fb-9ae0-4f66-abfd-9a06997e2492/Images/gardenlinux-nvme-gen2/Versions/1877.3.0
9898
hyper_v_generation: V2
9999
published_marketplace_images: []
100+
publishing_group: ''
100101
require_uefi: false
101102
s3_bucket: gardenlinux-github-releases
102103
s3_key: meta/singles/azure-gardener_prod-amd64-1877.3-75df9f40

test-data/release_notes/s3_bucket_artifacts/azure-gardener_prod-arm64.s3_metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ published_image_metadata:
103103
community_gallery_image_id: /CommunityGalleries/gardenlinux-8e6518fb-9ae0-4f66-abfd-9a06997e2492/Images/gardenlinux-nvme-arm64-gen2/Versions/1877.3.0
104104
hyper_v_generation: V2
105105
published_marketplace_images: []
106+
publishing_group: ''
106107
require_uefi: false
107108
s3_bucket: gardenlinux-github-releases
108109
s3_key: meta/singles/azure-gardener_prod-arm64-1877.3-75df9f40

0 commit comments

Comments
 (0)