From 01fa697d40ed2f13aee22e64aa01021e87ac866c Mon Sep 17 00:00:00 2001 From: yhaliaw Date: Fri, 20 Mar 2026 12:19:25 +0800 Subject: [PATCH 1/2] Add resolute charm config --- docs/changelog.md | 3 +++ src/state.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index f14883ad..d7356b48 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,9 @@ +## [#206 Add resolute image support] +* Add resolute image support. + ## [#198 Update integration tests](https://github.com/canonical/github-runner-image-builder-operator/pull/198) (2026-02-17) * Update integration tests that were intentionally not done in #185. diff --git a/src/state.py b/src/state.py index 0cc369cd..506d68f2 100644 --- a/src/state.py +++ b/src/state.py @@ -137,11 +137,13 @@ class BaseImage(str, Enum): FOCAL: The focal ubuntu LTS image. JAMMY: The jammy ubuntu LTS image. NOBLE: The noble ubuntu LTS image. + RESOLUTE: The resolute ubuntu LTS image. """ FOCAL = "focal" JAMMY = "jammy" NOBLE = "noble" + RESOLUTE = "resolute" def __str__(self) -> str: """Interpolate to string value. From eedebe472bb4f80aa28ac4b7a5f852979922b69f Mon Sep 17 00:00:00 2001 From: yhaliaw Date: Fri, 20 Mar 2026 15:42:14 +0800 Subject: [PATCH 2/2] Debug --- .github/workflows/integration_test.yaml | 2 ++ tests/integration/conftest.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 801904c7..cf88b2cf 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -25,6 +25,8 @@ jobs: builder-runner-label: X64 pre-run-script: | -c "./tests/integration/aproxy_prerouting_workaround.sh" + tmate-debug: true + tmate-timeout: 3000 allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 1d130d93..1ad55aa6 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -317,7 +317,7 @@ def test_configs_fixture( def image_configs_fixture(): """The image configuration values used to parametrize image build.""" return ImageConfigs( - bases=("noble",), + bases=("resolute",), )