Merge branch 'main' into fix_optional_test-rock_jobs

canonical · Dec 4, 2024 · 1120b2b · 1120b2b
2 parents fc455d4 + b9a0d39
commit 1120b2b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/oci/mimir/image.yaml b/oci/mimir/image.yaml
@@ -1,18 +1,18 @@
 version: 1
 upload:
   - source: canonical/mimir-rock
-    commit: 130a427f31db55028183aa9842f7fdd6778ad733
-    directory: 2.13.0
+    commit: 34cb1b03a93d190f805a3c9c5578056978f0014d
+    directory: 2.14.2
     release:
-      2.13.0-22.04:
-        end-of-life: "2025-01-08T00:00:00Z"
+      2.14.2-22.04:
+        end-of-life: "2025-03-02T00:00:00Z"
         risks:
           - stable
-      2.13-22.04:
-        end-of-life: "2025-01-08T00:00:00Z"
+      2.14-22.04:
+        end-of-life: "2025-03-02T00:00:00Z"
         risks:
           - stable
       2-22.04:
-        end-of-life: "2025-01-08T00:00:00Z"
+        end-of-life: "2025-03-02T00:00:00Z"
         risks:
           - stable
diff --git a/oci/mock-rock/_releases.json b/oci/mock-rock/_releases.json
@@ -35,31 +35,31 @@
     "1.1-22.04": {
         "end-of-life": "2030-05-01T00:00:00Z",
         "candidate": {
-            "target": "957"
+            "target": "960"
         },
         "beta": {
-            "target": "957"
+            "target": "960"
         },
         "edge": {
-            "target": "957"
+            "target": "960"
         }
     },
     "1-22.04": {
         "end-of-life": "2030-05-01T00:00:00Z",
         "candidate": {
-            "target": "957"
+            "target": "960"
         },
         "beta": {
-            "target": "957"
+            "target": "960"
         },
         "edge": {
-            "target": "957"
+            "target": "960"
         }
     },
     "1.2-22.04": {
         "end-of-life": "2030-05-01T00:00:00Z",
         "beta": {
-            "target": "958"
+            "target": "961"
         },
         "edge": {
             "target": "1.2-22.04_beta"

diff --git a/tests/etc/requirements.txt b/tests/etc/requirements.txt
@@ -1,3 +1,3 @@
-pytest==8.3.2
+pytest==8.3.4
 -r ../../src/build_rock/configure/requirements.txt
 -r ../../src/image/requirements.txt