diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 9ed08c6f..99cb9ad4 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.10', '3.12'] + python-version: ['3.8', '3.10', '3.12', '3.14'] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v6 @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.10', '3.12'] + python-version: ['3.8', '3.10', '3.12', '3.14'] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v6 @@ -139,6 +139,7 @@ jobs: - "tox -e func -- -v --base ubuntu@20.04 --keep-models" - "tox -e func -- -v --base ubuntu@22.04 --keep-models" - "tox -e func -- -v --base ubuntu@24.04 --keep-models" + - "tox -e func -- -v --base ubuntu@26.04 --keep-models" steps: - uses: actions/checkout@v6 with: @@ -190,6 +191,8 @@ jobs: # It is designed to work both with charms that output one file per base, # and charms that output a single file to run on all bases. # Not all charms will use them, and for some charms the variables will resolve to the same file. + export CHARM_PATH_RESOLUTE="$(pwd)/$(ls | grep '.*26.04.*\.charm$')" + echo "$CHARM_PATH_RESOLUTE" export CHARM_PATH_NOBLE="$(pwd)/$(ls | grep '.*24.04.*\.charm$')" echo "$CHARM_PATH_NOBLE" export CHARM_PATH_JAMMY="$(pwd)/$(ls | grep '.*22.04.*\.charm$')" diff --git a/charmcraft.yaml b/charmcraft.yaml index 87967460..aec523e6 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -22,15 +22,19 @@ platforms: ubuntu@20.04:amd64: ubuntu@22.04:amd64: ubuntu@24.04:amd64: + ubuntu@26.04:amd64: ubuntu@20.04:arm64: ubuntu@22.04:arm64: ubuntu@24.04:arm64: + ubuntu@26.04:arm64: ubuntu@20.04:s390x: ubuntu@22.04:s390x: ubuntu@24.04:s390x: + ubuntu@26.04:s390x: ubuntu@20.04:ppc64el: ubuntu@22.04:ppc64el: ubuntu@24.04:ppc64el: + ubuntu@26.04:ppc64el: actions: redetect-hardware: diff --git a/tests/functional/bundle.yaml.j2 b/tests/functional/bundle.yaml.j2 index 33debf7d..297a42fc 100644 --- a/tests/functional/bundle.yaml.j2 +++ b/tests/functional/bundle.yaml.j2 @@ -12,11 +12,12 @@ applications: {% if base == "ubuntu@20.04" %} grafana-agent: charm: grafana-agent + channel: 2/stable {% else %} opentelemetry-collector: charm: opentelemetry-collector + channel: 0.130/stable {% endif %} - channel: 2/stable hardware-observer: charm: {{ charm }} options: diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py index b0b6d5e7..b0211f99 100644 --- a/tests/functional/conftest.py +++ b/tests/functional/conftest.py @@ -22,7 +22,7 @@ def pytest_addoption(parser): "--base", type=str.lower, default="ubuntu@22.04", - choices=["ubuntu@20.04", "ubuntu@22.04", "ubuntu@24.04"], + choices=["ubuntu@20.04", "ubuntu@22.04", "ubuntu@24.04", "ubuntu@26.04"], help="Set base for the applications.", ) diff --git a/tests/manual/etc/4_deploy_grafana_agent/main.tf b/tests/manual/etc/4_deploy_grafana_agent/main.tf index 97339b0c..d74d2638 100644 --- a/tests/manual/etc/4_deploy_grafana_agent/main.tf +++ b/tests/manual/etc/4_deploy_grafana_agent/main.tf @@ -13,7 +13,7 @@ module "opentelemetry-collector" { source = "git::https://github.com/canonical/snap-openstack.git//sunbeam-python/sunbeam/features/observability/etc/deploy-grafana-agent?ref=fa2e56ce687c046b4c931512564787eac419e3ab" opentelemetry-collector-base = var.opentelemetry_collector_base - opentelemetry-collector-channel = "2/stable" + opentelemetry-collector-channel = "0.130/stable" principal-application-model-uuid = var.machine_model_uuid receive-remote-write-offer-url = var.receive-remote-write-offer-url grafana-dashboard-offer-url = var.grafana-dashboard-offer-url