Skip to content

Commit 612bdbc

Browse files
[DPE-8600] Point certificates charm to 1/stable (#718)
1 parent ef846a3 commit 612bdbc

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

tests/integration/integration/backups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
logger = logging.getLogger(__name__)
2222

2323
S3_INTEGRATOR = "s3-integrator"
24-
S3_INTEGRATOR_CHANNEL = "latest/stable"
24+
S3_INTEGRATOR_CHANNEL = "1/stable"
2525
MYSQL_APPLICATION_NAME = "mysql"
2626
TIMEOUT = 10 * 60
2727
SERVER_CONFIG_USER = "serverconfig"

tests/integration/integration/test_backup_aws.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
logger = logging.getLogger(__name__)
2929

3030
S3_INTEGRATOR = "s3-integrator"
31-
S3_INTEGRATOR_CHANNEL = "latest/stable"
31+
S3_INTEGRATOR_CHANNEL = "1/stable"
3232
TIMEOUT = 15 * 60
3333
CLUSTER_ADMIN_USER = "clusteradmin"
3434
CLUSTER_ADMIN_PASSWORD = "clusteradminpassword"

tests/integration/integration/test_backup_ceph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
logger = logging.getLogger(__name__)
3434

3535
S3_INTEGRATOR = "s3-integrator"
36-
S3_INTEGRATOR_CHANNEL = "latest/stable"
36+
S3_INTEGRATOR_CHANNEL = "1/stable"
3737
TIMEOUT = 10 * 60
3838
CLUSTER_ADMIN_USER = "clusteradmin"
3939
CLUSTER_ADMIN_PASSWORD = "clusteradminpassword"

tests/integration/integration/test_backup_gcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
logger = logging.getLogger(__name__)
2929

3030
S3_INTEGRATOR = "s3-integrator"
31-
S3_INTEGRATOR_CHANNEL = "latest/stable"
31+
S3_INTEGRATOR_CHANNEL = "1/stable"
3232
TIMEOUT = 10 * 60
3333
CLUSTER_ADMIN_USER = "clusteradmin"
3434
CLUSTER_ADMIN_PASSWORD = "clusteradminpassword"

tests/integration/integration/test_tls.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@
3030

3131
if juju_.has_secrets:
3232
tls_app_name = "self-signed-certificates"
33-
tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
33+
tls_channel = "1/stable"
3434
tls_config = {"ca-common-name": "Test CA"}
35+
tls_base = "[email protected]"
3536
else:
3637
tls_app_name = "tls-certificates-operator"
3738
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
3839
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
40+
tls_base = "[email protected]"
3941

4042

4143
@pytest.mark.abort_on_fail
@@ -82,7 +84,10 @@ async def test_enable_tls(ops_test: OpsTest) -> None:
8284
logger.info("Deploy TLS operator")
8385
async with ops_test.fast_forward("60s"):
8486
await ops_test.model.deploy(
85-
tls_app_name, channel=tls_channel, config=tls_config, base="[email protected]"
87+
tls_app_name,
88+
channel=tls_channel,
89+
config=tls_config,
90+
base=tls_base,
8691
)
8792
await ops_test.model.wait_for_idle(apps=[tls_app_name], status="active", timeout=15 * 60)
8893

0 commit comments

Comments
 (0)