Skip to content

Commit bd6e7a9

Browse files
dragomirprenovate[bot]marceloneppelgithub-actions[bot]sinclert-canonical
authored
[DPE-6112] Pg16 tweaks (#893)
* Update dependency uv to v0.5.27 (#847) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [DPE-6053] Fix ports (#846) * Fix ports Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Remove unused import Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Remove unused charm library and fix unit tests Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Fix identation Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Bump libs * Conditional set_ports logic * Unit test * Don't expect juju managed resources --------- Signed-off-by: Marcelo Henrique Neppel <[email protected]> Co-authored-by: Marcelo Henrique Neppel <[email protected]> * Sync docs from Discourse (#801) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> * Update dependency uv to v0.5.29 (#848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Define charm utility properties (#842) * Update data-platform-workflows to v29.1.0 (#849) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use `charmcraft test` & concierge (#852) * [MISC] Split topology script (#853) * Update charmcraft.yaml build tools (#851) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency uv to v0.5.31 (#858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v30 (#859) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use _promote_charm.yaml (#860) Use `charmcraft promote` and auto-generate release notes * Update dependency cryptography to v44.0.1 [SECURITY] (#855) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Sync docs from Discourse (#854) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> * Update data-platform-workflows to v30.0.2 (#863) * Update canonical/has-signed-canonical-cla action to v2 (#865) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [DPE-5827] Set all nodes to synchronous replicas (#784) * Update patroni configuration * Update test assertion * Copy update_synchronous_node_count from VM * Add unit test * Set sync node count during upgrade * Fix tls test * Switchover primary * Add different helper to get leader * Add config boilerplate * Use config value when setting sync node count * Escape tuple * Add policy values * Add integration test * Fix casting * Fix test * Update to spec * Bump retry timout * Switch to planned units * Fix generator * Update conf description * Spread task * Pass the charm * [DPE-6484] Add scope to promote to primary (#850) * Promote unit action * Tweaks for failing REST calls * VM parity * [MISC] Enable RBAC in tests (#861) * Enable RBAC * Bump cosl * Add trust * Bump libs * [MISC] Define charm constants (#862) * Lock file maintenance Python dependencies (#835) * Lock file maintenance Python dependencies * Backoff boto3 1.36 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dragomir Penev <[email protected]> * Update canonical/data-platform-workflows action to v30.1.3 (#856) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update charmcraft.yaml build tools (#868) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Handle missing stanza output (#866) * Update ghcr.io/canonical/charmed-postgresql:14.15-22.04_edge Docker digest to 71d49b6 (#870) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Disable storage test on arm (#872) * Disable storage test on Arm * Bump libs * Correct import path * Update charmcraft.yaml build tools (#871) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Add degraded status to primary message (#874) * Add degraded status on to primary message * Use const running tests * [MISC] Sanitize PostgreSQL extra-user-roles arg (#876) * [MISC] Fix PostgreSQL lib function signature (#879) * [MISC] Skip backup tests without creds (#884) * Bump libs * Skip backups tests if no creds are set * Check that the cloud config is set to a value * Typo * Update tests/integration/conftest.py Co-authored-by: Carl Csaposs <[email protected]> * Switch all checks to gets * Typo --------- Co-authored-by: Carl Csaposs <[email protected]> * [DPE-6679] PostgreSQL Config Improvement (#867) * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * Update dependency jinja2 to v3.1.6 [SECURITY] (#882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v30.2.0 (#887) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Reduce required approvals on Renovate pull requests by 1 (#880) * Update dependency uv to v0.6.5 (#878) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update ghcr.io/canonical/charmed-postgresql Docker tag to v14.17 (#877) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency uv to v0.6.7 (#890) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v31 (#891) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Try the new timescale * Check PR on */edge * Enable cache, disable pgaudit * Use the right base * Arm tests --------- Signed-off-by: Marcelo Henrique Neppel <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Marcelo Henrique Neppel <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Sinclert Pérez <[email protected]> Co-authored-by: Carl Csaposs <[email protected]> Co-authored-by: Danylo Bereznenko <[email protected]>
1 parent 71e8e16 commit bd6e7a9

File tree

15 files changed

+16
-39
lines changed

15 files changed

+16
-39
lines changed

.github/workflows/approve_renovate_pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ on:
1010
jobs:
1111
approve-pr:
1212
name: Approve Renovate pull request
13-
uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v30.2.0
13+
uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v31.0.0
1414
permissions:
1515
pull-requests: write # Needed to approve PR

.github/workflows/check_pr.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ on:
1111
- edited
1212
branches:
1313
- main
14+
- '*/edge'
1415

1516
jobs:
1617
check-pr:
1718
name: Check pull request
18-
uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v30.2.0
19+
uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v31.0.0

.github/workflows/ci.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
jobs:
2828
lint:
2929
name: Lint
30-
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v30.2.0
30+
uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v31.0.0
3131

3232
unit-test:
3333
name: Unit test charm
@@ -49,9 +49,7 @@ jobs:
4949

5050
build:
5151
name: Build charm
52-
uses: canonical/data-platform-workflows/.github/workflows/[email protected]
53-
with:
54-
cache: false
52+
uses: canonical/data-platform-workflows/.github/workflows/[email protected]
5553

5654
integration-test:
5755
name: Integration test charm

.github/workflows/promote.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
promote:
2727
name: Promote charm
28-
uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v30.2.0
28+
uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v31.0.0
2929
with:
3030
track: '16'
3131
from-risk: ${{ inputs.from-risk }}

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
name: Release charm
4545
needs:
4646
- ci-tests
47-
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v30.2.0
47+
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0
4848
with:
4949
channel: ${{ github.ref_name }}
5050
artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}

.github/workflows/sync_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
sync-docs:
1212
name: Sync docs from Discourse
13-
uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v30.2.0
13+
uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v31.0.0
1414
with:
1515
reviewers: a-velasco
1616
permissions:

charmcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ parts:
2727
PIP_BREAK_SYSTEM_PACKAGES=true python3 -m pip install --user --upgrade pip==25.0.1 # renovate: charmcraft-pip-latest
2828
2929
# Use uv to install poetry so that a newer version of Python can be installed if needed by poetry
30-
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
30+
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
3131
# poetry 2.0.0 requires Python >=3.9
3232
if ! "$HOME/.local/bin/uv" python find '>=3.9'
3333
then

tests/integration/ha_tests/test_upgrade.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from pytest_operator.plugin import OpsTest
1313
from tenacity import Retrying, stop_after_attempt, wait_fixed
1414

15-
from .. import markers
1615
from ..helpers import (
1716
APPLICATION_NAME,
1817
CHARM_BASE,
@@ -36,8 +35,6 @@
3635
TIMEOUT = 600
3736

3837

39-
# No arm edge
40-
@markers.amd64_only
4138
@pytest.mark.abort_on_fail
4239
async def test_deploy_latest(ops_test: OpsTest) -> None:
4340
"""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:
6865
assert len(ops_test.model.applications[DATABASE_APP_NAME].units) == 3
6966

7067

71-
# No arm edge
72-
@markers.amd64_only
7368
@pytest.mark.abort_on_fail
7469
async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
7570
"""Test that the pre-upgrade-check action runs successfully."""
@@ -96,8 +91,6 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
9691
assert stateful_set.spec.updateStrategy.rollingUpdate.partition == 2, "Partition not set to 2"
9792

9893

99-
# No arm edge
100-
@markers.amd64_only
10194
@pytest.mark.abort_on_fail
10295
async def test_upgrade_from_edge(ops_test: OpsTest, charm, continuous_writes) -> None:
10396
# 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) ->
160153
)
161154

162155

163-
# No arm edge
164-
@markers.amd64_only
165156
@pytest.mark.abort_on_fail
166157
async def test_fail_and_rollback(ops_test, charm, continuous_writes) -> None:
167158
# Start an application that continuously writes data to the database.

tests/integration/ha_tests/test_upgrade_from_stable.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from ..helpers import (
1414
APPLICATION_NAME,
1515
CHARM_BASE,
16+
CHARM_BASE_NOBLE,
1617
DATABASE_APP_NAME,
1718
METADATA,
1819
count_switchovers,
@@ -34,15 +35,14 @@
3435
@pytest.mark.abort_on_fail
3536
async def test_deploy_stable(ops_test: OpsTest) -> None:
3637
"""Simple test to ensure that the PostgreSQL and application charms get deployed."""
37-
# TODO remove once we release to stable
38-
pytest.skip("No 16/stable yet.")
3938
await asyncio.gather(
4039
ops_test.model.deploy(
4140
DATABASE_APP_NAME,
4241
num_units=3,
43-
channel="16/stable",
42+
# TODO move to stable once we release
43+
channel="16/beta",
4444
trust=True,
45-
base=CHARM_BASE,
45+
base=CHARM_BASE_NOBLE,
4646
),
4747
ops_test.model.deploy(
4848
APPLICATION_NAME,
@@ -62,8 +62,6 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
6262
@pytest.mark.abort_on_fail
6363
async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
6464
"""Test that the pre-upgrade-check action runs successfully."""
65-
# TODO remove once we release to stable
66-
pytest.skip("No 16/stable yet.")
6765
application = ops_test.model.applications[DATABASE_APP_NAME]
6866
if "pre-upgrade-check" not in await application.get_actions():
6967
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:
9593
@pytest.mark.abort_on_fail
9694
async def test_upgrade_from_stable(ops_test: OpsTest, charm):
9795
"""Test updating from stable channel."""
98-
# TODO remove once we release to stable
99-
pytest.skip("No 16/stable yet.")
10096
# Start an application that continuously writes data to the database.
10197
logger.info("starting continuous writes to the database")
10298
await start_continuous_writes(ops_test, DATABASE_APP_NAME)

tests/integration/test_backups_aws.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from pytest_operator.plugin import OpsTest
88
from tenacity import Retrying, stop_after_attempt, wait_exponential
99

10-
from . import architecture
1110
from .conftest import AWS
1211
from .helpers import (
1312
DATABASE_APP_NAME,
@@ -27,7 +26,7 @@
2726
FAILED_TO_INITIALIZE_STANZA_ERROR_MESSAGE = "failed to initialize stanza, check your S3 settings"
2827
S3_INTEGRATOR_APP_NAME = "s3-integrator"
2928
tls_certificates_app_name = "self-signed-certificates"
30-
tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
29+
tls_channel = "latest/stable"
3130
tls_config = {"ca-common-name": "Test CA"}
3231

3332
logger = logging.getLogger(__name__)

0 commit comments

Comments
 (0)