canonical · dragomirp · Mar 20, 2025 · Feb 4, 2025 · Feb 4, 2025 · Feb 6, 2025
diff --git a/.github/workflows/approve_renovate_pr.yaml b/.github/workflows/approve_renovate_pr.yaml
@@ -10,6 +10,6 @@ on:
 jobs:
   approve-pr:
     name: Approve Renovate pull request
-    uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v30.2.0
+    uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v31.0.0
     permissions:
       pull-requests: write  # Needed to approve PR
diff --git a/.github/workflows/check_pr.yaml b/.github/workflows/check_pr.yaml
@@ -11,8 +11,9 @@ on:
       - edited
     branches:
       - main
+      - '*/edge'
 
 jobs:
   check-pr:
     name: Check pull request
-    uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v30.2.0
+    uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v31.0.0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,7 +27,7 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v30.2.0
+    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v31.0.0
 
   unit-test:
     name: Unit test charm
@@ -49,9 +49,7 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v30.2.0
-    with:
-      cache: false
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v31.0.0
 
   integration-test:
     name: Integration test charm

diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
@@ -25,7 +25,7 @@ on:
 jobs:
   promote:
     name: Promote charm
-    uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v30.2.0
+    uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v31.0.0
     with:
       track: '16'
       from-risk: ${{ inputs.from-risk }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -44,7 +44,7 @@ jobs:
     name: Release charm
     needs:
       - ci-tests
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v30.2.0
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0
     with:
       channel: ${{ github.ref_name }}
       artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}

diff --git a/.github/workflows/sync_docs.yaml b/.github/workflows/sync_docs.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   sync-docs:
     name: Sync docs from Discourse
-    uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v30.2.0
+    uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v31.0.0
     with:
       reviewers: a-velasco
     permissions:

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -27,7 +27,7 @@ parts:
       PIP_BREAK_SYSTEM_PACKAGES=true python3 -m pip install --user --upgrade pip==25.0.1  # renovate: charmcraft-pip-latest
 
       # Use uv to install poetry so that a newer version of Python can be installed if needed by poetry
-      curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.6.5/uv-installer.sh | sh  # renovate: charmcraft-uv-latest
+      curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.6.7/uv-installer.sh | sh  # renovate: charmcraft-uv-latest
       # poetry 2.0.0 requires Python >=3.9
       if ! "$HOME/.local/bin/uv" python find '>=3.9'
       then

diff --git a/tests/integration/ha_tests/test_upgrade.py b/tests/integration/ha_tests/test_upgrade.py
@@ -12,7 +12,6 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_fixed
 
-from .. import markers
 from ..helpers import (
     APPLICATION_NAME,
     CHARM_BASE,
@@ -36,8 +35,6 @@
 TIMEOUT = 600
 
 
-# No arm edge
-@markers.amd64_only
 @pytest.mark.abort_on_fail
 async def test_deploy_latest(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
@@ -68,8 +65,6 @@ async def test_deploy_latest(ops_test: OpsTest) -> None:
     assert len(ops_test.model.applications[DATABASE_APP_NAME].units) == 3
 
 
-# No arm edge
-@markers.amd64_only
 @pytest.mark.abort_on_fail
 async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     """Test that the pre-upgrade-check action runs successfully."""
@@ -96,8 +91,6 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     assert stateful_set.spec.updateStrategy.rollingUpdate.partition == 2, "Partition not set to 2"
 
 
-# No arm edge
-@markers.amd64_only
 @pytest.mark.abort_on_fail
 async def test_upgrade_from_edge(ops_test: OpsTest, charm, continuous_writes) -> None:
     # Start an application that continuously writes data to the database.
@@ -160,8 +153,6 @@ async def test_upgrade_from_edge(ops_test: OpsTest, charm, continuous_writes) ->
     )
 
 
-# No arm edge
-@markers.amd64_only
 @pytest.mark.abort_on_fail
 async def test_fail_and_rollback(ops_test, charm, continuous_writes) -> None:
     # Start an application that continuously writes data to the database.

diff --git a/tests/integration/ha_tests/test_upgrade_from_stable.py b/tests/integration/ha_tests/test_upgrade_from_stable.py
@@ -13,6 +13,7 @@
 from ..helpers import (
     APPLICATION_NAME,
     CHARM_BASE,
+    CHARM_BASE_NOBLE,
     DATABASE_APP_NAME,
     METADATA,
     count_switchovers,
@@ -34,15 +35,14 @@
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
-    # TODO remove once we release to stable
-    pytest.skip("No 16/stable yet.")
     await asyncio.gather(
         ops_test.model.deploy(
             DATABASE_APP_NAME,
             num_units=3,
-            channel="16/stable",
+            # TODO move to stable once we release
+            channel="16/beta",
             trust=True,
-            base=CHARM_BASE,
+            base=CHARM_BASE_NOBLE,
         ),
         ops_test.model.deploy(
             APPLICATION_NAME,
@@ -62,8 +62,6 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
 @pytest.mark.abort_on_fail
 async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     """Test that the pre-upgrade-check action runs successfully."""
-    # TODO remove once we release to stable
-    pytest.skip("No 16/stable yet.")
     application = ops_test.model.applications[DATABASE_APP_NAME]
     if "pre-upgrade-check" not in await application.get_actions():
         logger.info("skipping the test because the charm from 14/stable doesn't support upgrade")
@@ -95,8 +93,6 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
 @pytest.mark.abort_on_fail
 async def test_upgrade_from_stable(ops_test: OpsTest, charm):
     """Test updating from stable channel."""
-    # TODO remove once we release to stable
-    pytest.skip("No 16/stable yet.")
     # Start an application that continuously writes data to the database.
     logger.info("starting continuous writes to the database")
     await start_continuous_writes(ops_test, DATABASE_APP_NAME)

diff --git a/tests/integration/test_backups_aws.py b/tests/integration/test_backups_aws.py
@@ -7,7 +7,6 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_exponential
 
-from . import architecture
 from .conftest import AWS
 from .helpers import (
     DATABASE_APP_NAME,
@@ -27,7 +26,7 @@
 FAILED_TO_INITIALIZE_STANZA_ERROR_MESSAGE = "failed to initialize stanza, check your S3 settings"
 S3_INTEGRATOR_APP_NAME = "s3-integrator"
 tls_certificates_app_name = "self-signed-certificates"
-tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+tls_channel = "latest/stable"
 tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

diff --git a/tests/integration/test_backups_gcp.py b/tests/integration/test_backups_gcp.py
@@ -10,7 +10,6 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_exponential
 
-from . import architecture
 from .conftest import GCP
 from .helpers import (
     DATABASE_APP_NAME,
@@ -30,7 +29,7 @@
 FAILED_TO_INITIALIZE_STANZA_ERROR_MESSAGE = "failed to initialize stanza, check your S3 settings"
 S3_INTEGRATOR_APP_NAME = "s3-integrator"
 tls_certificates_app_name = "self-signed-certificates"
-tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+tls_channel = "latest/stable"
 tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

diff --git a/tests/integration/test_backups_pitr_gcp.py b/tests/integration/test_backups_pitr_gcp.py
@@ -7,7 +7,6 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_exponential
 
-from . import architecture
 from .conftest import GCP
 from .helpers import (
     DATABASE_APP_NAME,
@@ -22,7 +21,7 @@
 CANNOT_RESTORE_PITR = "cannot restore PITR, juju debug-log for details"
 S3_INTEGRATOR_APP_NAME = "s3-integrator"
 tls_certificates_app_name = "self-signed-certificates"
-tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+tls_channel = "latest/stable"
 tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

diff --git a/tests/spread/test_smoke.py/task.yaml b/tests/spread/test_smoke.py/task.yaml
@@ -5,5 +5,3 @@ execute: |
   tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
 artifacts:
   - allure-results
-systems:
-  - -ubuntu-24.04-arm
diff --git a/tests/spread/test_upgrade_from_stable.py/task.yaml b/tests/spread/test_upgrade_from_stable.py/task.yaml
@@ -5,5 +5,3 @@ execute: |
   tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
 artifacts:
   - allure-results
-systems:
-  - -ubuntu-24.04-arm
diff --git a/tests/unit/test_patroni.py b/tests/unit/test_patroni.py
@@ -214,7 +214,6 @@ def test_render_patroni_yml_file(harness, patroni):
             replication_password=patroni._replication_password,
             rewind_user=REWIND_USER,
             rewind_password=patroni._rewind_password,
-            minority_count=patroni._members_count // 2,
             synchronous_node_count=0,
             version="16",
             patroni_password=patroni._patroni_password,
@@ -250,7 +249,6 @@ def test_render_patroni_yml_file(harness, patroni):
             replication_password=patroni._replication_password,
             rewind_user=REWIND_USER,
             rewind_password=patroni._rewind_password,
-            minority_count=patroni._members_count // 2,
             synchronous_node_count=0,
             version="16",
             patroni_password=patroni._patroni_password,