Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MISC] Update snap due to outdated packages #238

Merged
merged 3 commits into from
Oct 6, 2023
Merged

[MISC] Update snap due to outdated packages #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08057d3
Update snap due to outdated packages
dragomirp Oct 4, 2023
b7a9a92
Switch TLS op track
dragomirp Oct 4, 2023
656f9a3
Clean up disk
dragomirp Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ jobs:
tox-environments:
- backup-integration
- charm-integration
- database-relation-integration
- db-relation-integration
- ha-replication-integration
- ha-self-healing-integration
Expand All @@ -89,6 +88,12 @@ jobs:
free-disk-space:
- false
include:
- tox-environments: database-relation-integration
agent-versions: "2.9.44" # renovate: latest juju 2
free-disk-space: true
- tox-environments: database-relation-integration
agent-versions: "3.1.5" # renovate: latest juju 3
free-disk-space: true
Comment on lines +91 to +96
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test started running out of disk space.

- tox-environments: db-admin-relation-integration
agent-versions: "2.9.44" # renovate: latest juju 2
free-disk-space: true
Expand Down
2 changes: 1 addition & 1 deletion src/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# Snap constants.
PGBACKREST_EXECUTABLE = "charmed-postgresql.pgbackrest"
POSTGRESQL_SNAP_NAME = "charmed-postgresql"
SNAP_PACKAGES = [(POSTGRESQL_SNAP_NAME, {"revision": "78"})]
SNAP_PACKAGES = [(POSTGRESQL_SNAP_NAME, {"revision": "79"})]

SNAP_COMMON_PATH = "/var/snap/charmed-postgresql/common"
SNAP_CURRENT_PATH = "/var/snap/charmed-postgresql/current"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ async def test_backup(ops_test: OpsTest, cloud_configs: Tuple[Dict, Dict]) -> No
# Deploy S3 Integrator and TLS Certificates Operator.
await ops_test.model.deploy(S3_INTEGRATOR_APP_NAME)
config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, config=config)
await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, config=config, channel="legacy/stable")

for cloud, config in cloud_configs[0].items():
# Deploy and relate PostgreSQL to S3 integrator (one database app for each cloud for now
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/test_tls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ async def test_tls_enabled(ops_test: OpsTest) -> None:
async with ops_test.fast_forward():
# Deploy TLS Certificates operator.
config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, config=config)
await ops_test.model.deploy(
TLS_CERTIFICATES_APP_NAME, config=config, channel="legacy/stable"
)

# Relate it to the PostgreSQL to enable TLS.
await ops_test.model.relate(DATABASE_APP_NAME, TLS_CERTIFICATES_APP_NAME)
Expand Down