Skip to content

Commit 6064d23

Browse files
committed
no glob for test artifacts metadata files
1 parent 880f538 commit 6064d23

File tree

2 files changed

+61
-4
lines changed

2 files changed

+61
-4
lines changed

tests/constants.py

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,59 @@
2929

3030
RELEASE_NOTES_TEST_DATA_DIR = Path(os.path.dirname(__file__)) / ".." / "test-data" / "release_notes"
3131
RELEASE_NOTES_S3_ARTIFACTS_DIR = RELEASE_NOTES_TEST_DATA_DIR / "s3_bucket_artifacts"
32+
33+
RELEASE_ARTIFACTS_METADATA_FILES = [
34+
"ali-gardener_prod-amd64.s3_metadata.yaml",
35+
"aws-gardener_prod-amd64.s3_metadata.yaml",
36+
"aws-gardener_prod-arm64.s3_metadata.yaml",
37+
"aws-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml",
38+
"aws-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml",
39+
"aws-gardener_prod_usi-amd64.s3_metadata.yaml",
40+
"aws-gardener_prod_usi-arm64.s3_metadata.yaml",
41+
"azure-gardener_prod-amd64.s3_metadata.yaml",
42+
"azure-gardener_prod-arm64.s3_metadata.yaml",
43+
"azure-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml",
44+
"azure-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml",
45+
"azure-gardener_prod_usi-amd64.s3_metadata.yaml",
46+
"azure-gardener_prod_usi-arm64.s3_metadata.yaml",
47+
"container-amd64.s3_metadata.yaml",
48+
"container-arm64.s3_metadata.yaml",
49+
"gcp-gardener_prod-amd64.s3_metadata.yaml",
50+
"gcp-gardener_prod-arm64.s3_metadata.yaml",
51+
"gcp-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml",
52+
"gcp-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml",
53+
"gcp-gardener_prod_usi-amd64.s3_metadata.yaml",
54+
"gcp-gardener_prod_usi-arm64.s3_metadata.yaml",
55+
"gdch-gardener_prod-amd64.s3_metadata.yaml",
56+
"gdch-gardener_prod-arm64.s3_metadata.yaml",
57+
"kvm-gardener_prod-amd64.s3_metadata.yaml",
58+
"kvm-gardener_prod-arm64.s3_metadata.yaml",
59+
"kvm-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml",
60+
"kvm-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml",
61+
"kvm-gardener_prod_usi-amd64.s3_metadata.yaml",
62+
"kvm-gardener_prod_usi-arm64.s3_metadata.yaml",
63+
"metal-capi-amd64.s3_metadata.yaml",
64+
"metal-capi-arm64.s3_metadata.yaml",
65+
"metal-gardener_prod-amd64.s3_metadata.yaml",
66+
"metal-gardener_prod-arm64.s3_metadata.yaml",
67+
"metal-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml",
68+
"metal-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml",
69+
"metal-gardener_prod_usi-amd64.s3_metadata.yaml",
70+
"metal-gardener_prod_usi-arm64.s3_metadata.yaml",
71+
"metal-gardener_pxe-amd64.s3_metadata.yaml",
72+
"metal-gardener_pxe-arm64.s3_metadata.yaml",
73+
"metal_pxe-amd64.s3_metadata.yaml",
74+
"metal_pxe-arm64.s3_metadata.yaml",
75+
"metal-vhost-amd64.s3_metadata.yaml",
76+
"metal-vhost-arm64.s3_metadata.yaml",
77+
"openstackbaremetal-gardener_prod-amd64.s3_metadata.yaml",
78+
"openstackbaremetal-gardener_prod-arm64.s3_metadata.yaml",
79+
"openstack-gardener_prod-amd64.s3_metadata.yaml",
80+
"openstack-gardener_prod-arm64.s3_metadata.yaml",
81+
"openstack-gardener_prod_tpm2_trustedboot-amd64.s3_metadata.yaml",
82+
"openstack-gardener_prod_tpm2_trustedboot-arm64.s3_metadata.yaml",
83+
"openstack-gardener_prod_usi-amd64.s3_metadata.yaml",
84+
"openstack-gardener_prod_usi-arm64.s3_metadata.yaml",
85+
"vmware-gardener_prod-amd64.s3_metadata.yaml",
86+
"vmware-gardener_prod-arm64.s3_metadata.yaml"
87+
]

tests/github/test_create_github_release_notes.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from gardenlinux.github.release_notes.helpers import get_variant_from_flavor
1313

1414
from ..constants import (
15+
RELEASE_ARTIFACTS_METADATA_FILES,
1516
RELEASE_NOTES_S3_ARTIFACTS_DIR,
1617
RELEASE_NOTES_TEST_DATA_DIR,
1718
TEST_GARDENLINUX_COMMIT,
@@ -90,11 +91,11 @@ def __new__(cls, *args, **kwargs):
9091
glvd_response_fixture_path = RELEASE_NOTES_TEST_DATA_DIR / f"glvd_{TEST_GARDENLINUX_RELEASE}.json"
9192

9293
with requests_mock.Mocker(real_http=True) as m:
93-
for yaml_file in RELEASE_NOTES_S3_ARTIFACTS_DIR.glob("*.yaml"):
94-
filename = yaml_file.name
95-
base = filename[:-len(".s3_metadata.yaml")]
94+
for yaml_file in RELEASE_ARTIFACTS_METADATA_FILES:
95+
filepath = f"{RELEASE_NOTES_S3_ARTIFACTS_DIR}/{yaml_file}"
96+
base = yaml_file[:-len(".s3_metadata.yaml")]
9697
key = f"meta/singles/{base}-{TEST_GARDENLINUX_RELEASE}-{TEST_GARDENLINUX_COMMIT}"
97-
release_s3_bucket.upload_file(str(yaml_file), key)
98+
release_s3_bucket.upload_file(filepath, key)
9899

99100
m.get(
100101
f"{GLVD_BASE_URL}/patchReleaseNotes/{TEST_GARDENLINUX_RELEASE}",

0 commit comments

Comments
 (0)