Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
run: |
mkdir ${{ env.DATA_DIR }}

./src/image/prepare_single_image_build_matrix.py \
python3 -m src.image.prepare_single_image_build_matrix \
--oci-path ${{ steps.validate-image.outputs.img-path }} \
--revision-data-dir ${{ env.DATA_DIR }}

Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:

mkdir ${{ env.DATA_DIR }}

./src/image/prepare_single_image_build_matrix.py \
python3 -m src.image.prepare_single_image_build_matrix \
--oci-path ${{ needs.prepare-build.outputs.oci-img-path }} \
--revision-data-dir ${{ env.DATA_DIR }} \
--next-revision ${{ steps.get-next-revision.outputs.revision }} \
Expand Down
16 changes: 11 additions & 5 deletions oci/mock-rock/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 1

release:
latest:
end-of-life: "2025-05-01T00:00:00Z"
end-of-life: "2030-05-01T00:00:00Z"
candidate: 1.0-22.04_candidate
test:
end-of-life: "2026-05-01T00:00:00Z"
Expand All @@ -13,24 +13,30 @@ upload:
commit: 17916dd5de270e61a6a3fd3f4661a6413a50fd6f
directory: mock_rock/1.0
release:
1.0-22.04:
1.0.0-22.04:
end-of-life: "2024-05-01T00:00:00Z"
risks:
- candidate
- edge
- beta
1.0-22.04:
end-of-life: "2030-05-01T00:00:00Z"
risks:
- candidate
- edge
- beta
- source: "canonical/rocks-toolbox"
commit: 17916dd5de270e61a6a3fd3f4661a6413a50fd6f
directory: mock_rock/1.1
release:
1.1-22.04:
end-of-life: "2025-05-01T00:00:00Z"
end-of-life: "2030-05-01T00:00:00Z"
risks:
- candidate
- edge
- beta
1-22.04:
end-of-life: "2025-05-01T00:00:00Z"
end-of-life: "2030-05-01T00:00:00Z"
risks:
- candidate
- edge
Expand All @@ -40,6 +46,6 @@ upload:
directory: mock_rock/1.2
release:
1.2-22.04:
end-of-life: "2025-05-01T00:00:00Z"
end-of-life: "2030-05-01T00:00:00Z"
risks:
- beta
4 changes: 2 additions & 2 deletions src/image/merge_release_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import json
import yaml

from utils.schema.triggers import ImageSchema, KNOWN_RISKS_ORDERED
from utils.schema.revision_data import RevisionDataSchema
from .utils.schema.triggers import ImageSchema, KNOWN_RISKS_ORDERED
from .utils.schema.revision_data import RevisionDataSchema


def backfill_higher_risks(channels: dict) -> None:
Expand Down
Loading
Loading