Skip to content

Commit 5fc3505

Browse files
DPE-8975 Move PG16 K8s TLS tests to 1/stable
1 parent cc58e87 commit 5fc3505

File tree

7 files changed

+16
-10
lines changed

7 files changed

+16
-10
lines changed

tests/integration/helpers.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,10 +883,13 @@ async def backup_operations(
883883
"""Basic set of operations for backup testing in different cloud providers."""
884884
# Deploy S3 Integrator and TLS Certificates Operator.
885885
use_tls = all([tls_certificates_app_name, tls_config, tls_channel])
886-
await ops_test.model.deploy(s3_integrator_app_name, base=CHARM_BASE)
886+
await ops_test.model.deploy(s3_integrator_app_name, base=CHARM_BASE_NOBLE)
887887
if use_tls:
888888
await ops_test.model.deploy(
889-
tls_certificates_app_name, config=tls_config, channel=tls_channel, base=CHARM_BASE
889+
tls_certificates_app_name,
890+
config=tls_config,
891+
channel=tls_channel,
892+
base=CHARM_BASE_NOBLE,
890893
)
891894
# Deploy and relate PostgreSQL to S3 integrator (one database app for each cloud for now
892895
# as archivo_mode is disabled after restoring the backup) and to TLS Certificates Operator

tests/integration/test_backups_aws.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
FAILED_TO_INITIALIZE_STANZA_ERROR_MESSAGE = "failed to initialize stanza, check your S3 settings"
2727
S3_INTEGRATOR_APP_NAME = "s3-integrator"
2828
tls_certificates_app_name = "self-signed-certificates"
29-
tls_channel = "latest/stable"
29+
tls_channel = "1/stable"
3030
tls_config = {"ca-common-name": "Test CA"}
3131

3232
logger = logging.getLogger(__name__)

tests/integration/test_backups_gcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
FAILED_TO_INITIALIZE_STANZA_ERROR_MESSAGE = "failed to initialize stanza, check your S3 settings"
3030
S3_INTEGRATOR_APP_NAME = "s3-integrator"
3131
tls_certificates_app_name = "self-signed-certificates"
32-
tls_channel = "latest/stable"
32+
tls_channel = "1/stable"
3333
tls_config = {"ca-common-name": "Test CA"}
3434

3535
logger = logging.getLogger(__name__)

tests/integration/test_backups_pitr_aws.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
CANNOT_RESTORE_PITR = "cannot restore PITR, juju debug-log for details"
2222
S3_INTEGRATOR_APP_NAME = "s3-integrator"
2323
tls_certificates_app_name = "self-signed-certificates"
24-
tls_channel = "latest/stable"
24+
tls_channel = "1/stable"
2525
tls_config = {"ca-common-name": "Test CA"}
2626

2727
logger = logging.getLogger(__name__)

tests/integration/test_backups_pitr_gcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
CANNOT_RESTORE_PITR = "cannot restore PITR, juju debug-log for details"
2222
S3_INTEGRATOR_APP_NAME = "s3-integrator"
2323
tls_certificates_app_name = "self-signed-certificates"
24-
tls_channel = "latest/stable"
24+
tls_channel = "1/stable"
2525
tls_config = {"ca-common-name": "Test CA"}
2626

2727
logger = logging.getLogger(__name__)

tests/integration/test_ldap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async def test_glauth_integration(ops_test: OpsTest):
4848
ops_test.model.deploy(
4949
GLAUTH_CERT_APP_NAME,
5050
application_name=glauth_cert_app_name,
51-
channel="latest/stable",
51+
channel="1/stable",
5252
trust=False,
5353
),
5454
ops_test.model.deploy(

tests/integration/test_tls.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
change_patroni_setting,
1313
)
1414
from .helpers import (
15-
CHARM_BASE,
15+
CHARM_BASE_NOBLE,
1616
DATABASE_APP_NAME,
1717
build_and_deploy,
1818
check_tls,
@@ -30,7 +30,7 @@
3030
logger = logging.getLogger(__name__)
3131

3232
tls_certificates_app_name = "self-signed-certificates"
33-
tls_channel = "latest/stable"
33+
tls_channel = "1/stable"
3434
tls_config = {"ca-common-name": "Test CA"}
3535
APPLICATION_UNITS = 2
3636
DATABASE_UNITS = 3
@@ -66,7 +66,10 @@ async def test_tls(ops_test: OpsTest) -> None:
6666
async with ops_test.fast_forward():
6767
# Deploy TLS Certificates operator.
6868
await ops_test.model.deploy(
69-
tls_certificates_app_name, config=tls_config, channel=tls_channel, base=CHARM_BASE
69+
tls_certificates_app_name,
70+
config=tls_config,
71+
channel=tls_channel,
72+
base=CHARM_BASE_NOBLE,
7073
)
7174
# Relate it to the PostgreSQL to enable TLS.
7275
await ops_test.model.relate(

0 commit comments

Comments
 (0)