Merge branch 'main' into renovate/ops-2.x

canonical · Sep 18, 2024 · dfc9500 · dfc9500
2 parents a2db786 + 02b19c9
commit dfc9500
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.trivyignore b/.trivyignore
@@ -6,4 +6,3 @@ CVE-2024-34156
 CVE-2023-5072
 # Jenkins CVEs
 CVE-2016-1000027
-
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-cosl==0.0.19
+cosl==0.0.20
 jenkinsapi==0.3.13
 jsonschema==4.23.0
 ops==2.16.1
-pydantic==1.10.17
+pydantic==1.10.18
 requests==2.32.3
diff --git a/tests/integration/files/identity-bundle-edge-patched.yaml b/tests/integration/files/identity-bundle-edge-patched.yaml
@@ -34,6 +34,7 @@ applications:
       oci-image: 79
   postgresql-k8s:
     charm: postgresql-k8s
+    revision: 300
     channel: 14/stable
     series: jammy
     scale: 1