diff --git a/agent/.python-version b/agent/.python-version index 7c7a975f4..e4fba2183 100644 --- a/agent/.python-version +++ b/agent/.python-version @@ -1 +1 @@ -3.10 \ No newline at end of file +3.12 diff --git a/agent/charms/testflinger-agent-host-charm/charmcraft.yaml b/agent/charms/testflinger-agent-host-charm/charmcraft.yaml index 9694a8fa1..15c56ceb1 100644 --- a/agent/charms/testflinger-agent-host-charm/charmcraft.yaml +++ b/agent/charms/testflinger-agent-host-charm/charmcraft.yaml @@ -28,7 +28,7 @@ links: issues: [https://github.com/canonical/testflinger/issues] website: [https://canonical-testflinger.readthedocs-hosted.com/en/latest/] -base: ubuntu@22.04 +base: ubuntu@24.04 platforms: amd64: diff --git a/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-test b/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-test index c1d1b72ad..191e950b8 100755 --- a/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-test +++ b/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-test @@ -6,7 +6,7 @@ PROVISION_TYPE="$provision_type" # Variables for docker image REGISTRY=ghcr.io NAMESPACE=canonical -IMAGE_TAG=jammy +IMAGE_TAG=noble IMAGE=testflinger/testflinger-testenv # The following variables are set by the agent charm diff --git a/cli/.python-version b/cli/.python-version index c8cfe3959..e4fba2183 100644 --- a/cli/.python-version +++ b/cli/.python-version @@ -1 +1 @@ -3.10 +3.12 diff --git a/cli/snapcraft.yaml b/cli/snapcraft.yaml index 37ab4c887..cd040605e 100644 --- a/cli/snapcraft.yaml +++ b/cli/snapcraft.yaml @@ -1,4 +1,5 @@ name: testflinger-cli +adopt-info: testflinger-cli license: GPL-3.0-only title: Testflinger summary: Testflinger CLI @@ -6,18 +7,19 @@ description: | The testflinger-cli tool is used for interacting with the testflinger server for submitting test jobs, checking status, getting results, and streaming output. -confinement: strict -base: core22 -grade: stable -adopt-info: testflinger-cli website: https://testflinger.readthedocs.io/en/latest/ source-code: https://github.com/canonical/testflinger issues: https://github.com/canonical/testflinger/issues contact: https://github.com/canonical/testflinger/issues -architectures: - - build-on: [amd64] +base: core24 +confinement: strict +grade: stable + +platforms: + all: + build-on: [amd64] build-for: [all] apps: diff --git a/common/.python-version b/common/.python-version new file mode 100644 index 000000000..e4fba2183 --- /dev/null +++ b/common/.python-version @@ -0,0 +1 @@ +3.12 diff --git a/device-connectors/.python-version b/device-connectors/.python-version index c8cfe3959..e4fba2183 100644 --- a/device-connectors/.python-version +++ b/device-connectors/.python-version @@ -1 +1 @@ -3.10 +3.12 diff --git a/server/.python-version b/server/.python-version index 7c7a975f4..e4fba2183 100644 --- a/server/.python-version +++ b/server/.python-version @@ -1 +1 @@ -3.10 \ No newline at end of file +3.12 diff --git a/server/Dockerfile b/server/Dockerfile index 361d66324..ef7bc59a4 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Set up uv COPY --from=ghcr.io/astral-sh/uv:0.7.7 /uv /uvx /bin/ ENV UV_SYSTEM_PYTHON=true \ - UV_COMPILE_BYTECODE=1 \ - UV_LINK_MODE=copy + UV_COMPILE_BYTECODE=1 \ + UV_LINK_MODE=copy WORKDIR /srv/testflinger ENV PATH="/srv/testflinger/.venv/bin:$PATH" diff --git a/server/charm/charmcraft.yaml b/server/charm/charmcraft.yaml index b9f7034a5..f80e4b469 100644 --- a/server/charm/charmcraft.yaml +++ b/server/charm/charmcraft.yaml @@ -43,7 +43,7 @@ charm-libs: - lib: observability_libs.juju_topology version: "0" -base: ubuntu@22.04 +base: ubuntu@24.04 platforms: amd64: