Skip to content

Commit d5dc9e6

Browse files
authored
chore: Pin integration tests charm dependencies (#883)
1 parent aa343c3 commit d5dc9e6

File tree

7 files changed

+21
-0
lines changed

7 files changed

+21
-0
lines changed

k8s/tests/integration/config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@
1717
APPLICATION_NAME = "vault-k8s"
1818
AUTOUNSEAL_TOKEN_SECRET_LABEL = "vault-autounseal-token"
1919
LOKI_APPLICATION_NAME = "loki-k8s"
20+
LOKI_REVISION = 199
2021
METADATA = yaml.safe_load(Path("./charmcraft.yaml").read_text())
2122
MINIO_APPLICATION_NAME = "minio"
23+
MINIO_REVISION = 383
2224
MINIO_S3_ACCESS_KEY = "minio_access_key"
2325
MINIO_S3_SECRET_KEY = "minio_secret_key"
2426
NUM_VAULT_UNITS = 3
2527
PROMETHEUS_APPLICATION_NAME = "prometheus-k8s"
28+
PROMETHEUS_REVISION = 247
2629
S3_INTEGRATOR_APPLICATION_NAME = "s3-integrator"
30+
S3_INTEGRATOR_REVISION = 146
2731
SELF_SIGNED_CERTIFICATES_APPLICATION_NAME = "self-signed-certificates"
2832
SELF_SIGNED_CERTIFICATES_CHANNEL = "1/stable"
2933
SELF_SIGNED_CERTIFICATES_REVISION = 263

k8s/tests/integration/test_backup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
from config import (
1111
APPLICATION_NAME,
1212
MINIO_APPLICATION_NAME,
13+
MINIO_REVISION,
1314
MINIO_S3_ACCESS_KEY,
1415
MINIO_S3_SECRET_KEY,
1516
NUM_VAULT_UNITS,
1617
S3_INTEGRATOR_APPLICATION_NAME,
18+
S3_INTEGRATOR_REVISION,
1719
SHORT_TIMEOUT,
1820
)
1921
from helpers import (
@@ -49,12 +51,14 @@ async def deploy(ops_test: OpsTest, vault_charm_path: Path, skip_deploy: bool) -
4951
S3_INTEGRATOR_APPLICATION_NAME,
5052
application_name=S3_INTEGRATOR_APPLICATION_NAME,
5153
channel="stable",
54+
revision=S3_INTEGRATOR_REVISION,
5255
trust=True,
5356
)
5457
await ops_test.model.deploy(
5558
MINIO_APPLICATION_NAME,
5659
application_name=MINIO_APPLICATION_NAME,
5760
channel="ckf-1.9/stable",
61+
revision=MINIO_REVISION,
5862
config={
5963
"access-key": MINIO_S3_ACCESS_KEY,
6064
"secret-key": MINIO_S3_SECRET_KEY,

k8s/tests/integration/test_cos.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
from config import (
1010
APPLICATION_NAME,
1111
LOKI_APPLICATION_NAME,
12+
LOKI_REVISION,
1213
NUM_VAULT_UNITS,
1314
PROMETHEUS_APPLICATION_NAME,
15+
PROMETHEUS_REVISION,
1416
SHORT_TIMEOUT,
1517
)
1618
from helpers import (
@@ -45,12 +47,14 @@ async def deploy(ops_test: OpsTest, vault_charm_path: Path, skip_deploy: bool) -
4547
application_name=PROMETHEUS_APPLICATION_NAME,
4648
trust=True,
4749
channel="1/stable",
50+
revision=PROMETHEUS_REVISION,
4851
)
4952
await ops_test.model.deploy(
5053
LOKI_APPLICATION_NAME,
5154
application_name=LOKI_APPLICATION_NAME,
5255
trust=True,
5356
channel="1/stable",
57+
revision=LOKI_REVISION,
5458
)
5559
await asyncio.gather(
5660
ops_test.model.wait_for_idle(

machine/tests/integration/config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66

77
APP_NAME: str = METADATA["name"]
88
GRAFANA_AGENT_APPLICATION_NAME = "grafana-agent"
9+
GRAFANA_AGENT_REVISION = 606
910
HAPROXY_APPLICATION_NAME = "haproxy"
11+
HAPROXY_REVISION = 290
1012
INGRESS_RELATION_NAME = "ingress"
1113
MINIO_APPLICATION_NAME = "minio"
1214
MINIO_S3_ACCESS_KEY = "vaultintegrationtest"
1315
MINIO_S3_SECRET_KEY = "vaultintegrationtest"
1416
NUM_VAULT_UNITS = 3
1517
PEER_RELATION_NAME = "vault-peers"
1618
S3_INTEGRATOR_APPLICATION_NAME = "s3-integrator"
19+
S3_INTEGRATOR_REVISION = 146
1720
SELF_SIGNED_CERTIFICATES_APPLICATION_NAME = "self-signed-certificates"
1821
SELF_SIGNED_CERTIFICATES_REVISION = 317
1922
VAULT_KV_REQUIRER_APPLICATION_NAME = "vault-kv-requirer"

machine/tests/integration/test_backup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
MINIO_S3_SECRET_KEY,
1515
NUM_VAULT_UNITS,
1616
S3_INTEGRATOR_APPLICATION_NAME,
17+
S3_INTEGRATOR_REVISION,
1718
SHORT_TIMEOUT,
1819
)
1920
from helpers import (
@@ -51,6 +52,7 @@ async def deploy(ops_test: OpsTest, vault_charm_path: Path, skip_deploy: bool) -
5152
await ops_test.model.deploy(
5253
S3_INTEGRATOR_APPLICATION_NAME,
5354
channel="stable",
55+
revision=S3_INTEGRATOR_REVISION,
5456
trust=True,
5557
)
5658

machine/tests/integration/test_cos_integration.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from config import (
1010
APP_NAME,
1111
GRAFANA_AGENT_APPLICATION_NAME,
12+
GRAFANA_AGENT_REVISION,
1213
JUJU_FAST_INTERVAL,
1314
NUM_VAULT_UNITS,
1415
SHORT_TIMEOUT,
@@ -40,6 +41,7 @@ async def deploy(ops_test: OpsTest, vault_charm_path: Path, skip_deploy: bool) -
4041
GRAFANA_AGENT_APPLICATION_NAME,
4142
series="noble",
4243
channel="1/stable",
44+
revision=GRAFANA_AGENT_REVISION,
4345
)
4446

4547
# When waiting for Vault to go to the blocked state, we may need an update

machine/tests/integration/test_ingress.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from config import (
1010
APP_NAME,
1111
HAPROXY_APPLICATION_NAME,
12+
HAPROXY_REVISION,
1213
JUJU_FAST_INTERVAL,
1314
NUM_VAULT_UNITS,
1415
SELF_SIGNED_CERTIFICATES_APPLICATION_NAME,
@@ -46,6 +47,7 @@ async def deploy(ops_test: OpsTest, vault_charm_path: Path, skip_deploy: bool) -
4647
await ops_test.model.deploy(
4748
HAPROXY_APPLICATION_NAME,
4849
channel="2.8/edge",
50+
revision=HAPROXY_REVISION,
4951
)
5052

5153
# When waiting for Vault to go to the blocked state, we may need an update

0 commit comments

Comments
 (0)