Fix: EOL filtering to only exclude builds with no valid tracks. #272

clay-lake · 2024-10-21T08:25:44Z

I have signed the CLA?
I am following the CONTRIBUTING guidelines

Included in this PR:

Fix EOL filtering to only exclude builds with no valid tracks.
Refactor of src/image/prepare_single_image_build_matrix.py.
Upgrade pydantic to 2.8.2 globally.
Respective testing for EOL handeling.
Testing for image trigger file validator.

src/image/prepare_single_image_build_matrix.py

zhijie-yang

Thanks for the changes. Nicely done. A few nitpicks regarding the formatting. I would also suggest use isort to sort the imports ;)

src/image/requirements.txt

tests/unit/test_image_trigger_file_validator.py

tests/unit/test_prepare_single_image_build_matrix.py

tests/unit/test_image_trigger_file_validator.py

src/image/prepare_single_image_build_matrix.py

zhijie-yang · 2024-11-08T16:01:25Z

src/image/prepare_single_image_build_matrix.py

+
+class InvalidSchemaError(Exception):
+    """Raised when image.yaml schema is found."""
+


Suggested change

zhijie-yang · 2024-11-08T16:02:15Z

src/image/utils/schema/triggers.py


-    class Config:
-        extra = pydantic.Extra.forbid
+    model_config = pydantic.ConfigDict(extra="forbid")


 class ChannelsSchema(pydantic.BaseModel):
    """Schema of the 'release' tracks within the image.yaml file."""



Suggested change

tests/unit/test_image_trigger_file_validator.py

…ithub.com/canonical/oci-factory/actions/runs/11745826612

* fix: correct bad mock-rock release config * fix: latest points to 1.2-22.04_beta --------- Co-authored-by: Zhijie Yang <[email protected]> Co-authored-by: zhijie-yang <zhijie-yang@localhost>

…ithub.com/canonical/oci-factory/actions/runs/11777300184

…factory into fix_eol_filtering

zhijie-yang

We will omit the blank line after the docstring in this PR as per the discussion offline. Looks good to me. Thanks.

fix: EOL filtering to only exclude builds with no valid tracks.

ae87140

clay-lake force-pushed the fix_eol_filtering branch from f5af210 to ae87140 Compare October 21, 2024 08:30

clay-lake marked this pull request as ready for review October 21, 2024 10:08

clay-lake requested a review from a team as a code owner October 21, 2024 10:08

cjdcordeiro requested a review from zhijie-yang October 21, 2024 10:24

cjdcordeiro reviewed Oct 21, 2024

View reviewed changes

src/image/prepare_single_image_build_matrix.py Show resolved Hide resolved

clay-lake added 8 commits October 30, 2024 16:35

fix: clean revision data of extra fields

beb931a

fix: correct import path

a5e7da1

fix: corrections for relative paths

502421a

fix: serialization of datetime object

342a805

fix: readded track to revision data json

6af1751

fix: broken import in src/image/merge_release_info.py

b20304a

Merge branch 'main' into fix_eol_filtering

c28721b

Merge branch 'main' into fix_eol_filtering

6ce0f03

zhijie-yang requested changes Nov 8, 2024

View reviewed changes

clay-lake and others added 15 commits November 8, 2024 16:45

ci: automatically update oci/mock-rock/_releases.json, from https://g…

6120c8a

…ithub.com/canonical/oci-factory/actions/runs/11745826612

fix: Correct Bad mock-rock Release Config (#285)

abf0197

* fix: correct bad mock-rock release config * fix: latest points to 1.2-22.04_beta --------- Co-authored-by: Zhijie Yang <[email protected]> Co-authored-by: zhijie-yang <zhijie-yang@localhost>

ci: automatically update oci/mock-rock/_releases.json, from https://g…

096fe5b

…ithub.com/canonical/oci-factory/actions/runs/11777300184

fix: formatting issues

d1b5f67

fix: syntax issue in python3.10

f341a46

fix: EOL filtering to only exclude builds with no valid tracks.

8e86560

fix: clean revision data of extra fields

7ce59ec

fix: correct import path

fc26de4

fix: corrections for relative paths

d647b9d

fix: serialization of datetime object

b761f30

fix: readded track to revision data json

c333e0c

fix: broken import in src/image/merge_release_info.py

6ba07dd

fix: formatting issues

e2b87e4

fix: syntax issue in python3.10

71c8579

Merge branch 'fix_eol_filtering' of https://github.com/canonical/oci-…

4dd7294

…factory into fix_eol_filtering

trigger build

deddda5

clay-lake requested a review from zhijie-yang November 11, 2024 13:04

zhijie-yang approved these changes Nov 11, 2024

View reviewed changes

clay-lake added 2 commits November 11, 2024 15:31

fix: dump revision_data by alias to fix eol field

d102dd9

test: added debug statement

f30157c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: EOL filtering to only exclude builds with no valid tracks. #272

Fix: EOL filtering to only exclude builds with no valid tracks. #272

clay-lake commented Oct 21, 2024 •

edited

Loading

zhijie-yang left a comment

zhijie-yang Nov 8, 2024

zhijie-yang Nov 8, 2024

zhijie-yang left a comment


		class InvalidSchemaError(Exception):
		"""Raised when image.yaml schema is found."""

Fix: EOL filtering to only exclude builds with no valid tracks. #272

Are you sure you want to change the base?

Fix: EOL filtering to only exclude builds with no valid tracks. #272

Conversation

clay-lake commented Oct 21, 2024 • edited Loading

zhijie-yang left a comment

Choose a reason for hiding this comment

zhijie-yang Nov 8, 2024

Choose a reason for hiding this comment

zhijie-yang Nov 8, 2024

Choose a reason for hiding this comment

zhijie-yang left a comment

Choose a reason for hiding this comment

clay-lake commented Oct 21, 2024 •

edited

Loading