From f5eb4e00e1fd3cbc19b9f459d0ef143bd668f4fa Mon Sep 17 00:00:00 2001 From: Valentin David Date: Mon, 6 May 2024 13:07:52 +0200 Subject: [PATCH] Revert "change some models to use beta bases" This reverts commit 533a750110bd10cc0ccb3ac21c615a5be03b48ef. --- .../test-snapd-recovery-system-pc-20.json | 4 +-- .../test-snapd-recovery-system-pc-20.model | 26 +++++++++---------- .../test-snapd-recovery-system-pc-22.json | 4 +-- .../test-snapd-recovery-system-pc-22.model | 26 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/lib/assertions/test-snapd-recovery-system-pc-20.json b/tests/lib/assertions/test-snapd-recovery-system-pc-20.json index 5facbe07d3af..904165dde753 100644 --- a/tests/lib/assertions/test-snapd-recovery-system-pc-20.json +++ b/tests/lib/assertions/test-snapd-recovery-system-pc-20.json @@ -6,7 +6,7 @@ "model": "my-model", "revision": "1", "architecture": "amd64", - "timestamp": "2024-04-19T08:58:37+00:00", + "timestamp": "2024-01-04T15:49:41+00:00", "grade": "dangerous", "base": "core20", "serial-authority": ["generic"], @@ -24,7 +24,7 @@ "type": "kernel" }, { - "default-channel": "latest/beta", + "default-channel": "latest/stable", "id": "DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q", "name": "core20", "type": "base" diff --git a/tests/lib/assertions/test-snapd-recovery-system-pc-20.model b/tests/lib/assertions/test-snapd-recovery-system-pc-20.model index 6eefc54c453c..e5e3cfcc0dc2 100644 --- a/tests/lib/assertions/test-snapd-recovery-system-pc-20.model +++ b/tests/lib/assertions/test-snapd-recovery-system-pc-20.model @@ -21,7 +21,7 @@ snaps: name: pc-kernel type: kernel - - default-channel: latest/beta + default-channel: latest/stable id: DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q name: core20 type: base @@ -46,16 +46,16 @@ snaps: - ephemeral name: hello-world type: app -timestamp: 2024-04-19T08:58:37+00:00 -sign-key-sha3-384: Dwtj-EPpm3Nh0t5OOaSz4nDgAr5ShnbPvIc89Q0F-LzxGbNWPgYEQ936W_vBigky +timestamp: 2024-01-04T15:49:41+00:00 +sign-key-sha3-384: 7qWG-Uwck6Dji43a3Z8ZZrm7rAziZAch3xf76iFvqe4GaD0LI7U9lYPWMSJAsEgu -AcLBcwQAAQoAHRYhBEqNlIFXB9LhztzSP90EciVbB6G9BQJmIjJ5AAoJEN0EciVbB6G9UhcQAIs0 -ErWq3vFGz3W8bhb89jNxhYYHiqsyzZD9k0eqT440rX2Mwv3KpmdUc3DjAHM3d0o50GHAPzJQaWXS -ZddrmzH0eVq6eLlc4oO1ApidEBWsyAv3hX9DQM1lJMGHJ3TTkPYSouK+lny9DC8hT12ZfnpbDUD7 -h9wHjBZ1d3ALz2pEdw9cezJbkBZnKquNfrq989G+K8UmE8D7UuYJLjArmhH0/IX0bxeLIgg/xwdr -aqEmI1RVE10M2zUjPh1+KpfVdjzh1POIm6LlFlDx29tOmgksuxyksLVydMswqVbgShMNxqRZweTo -zipstjh8hhvOCVWi/tLhN4Fj26MICkfYPCfbTBWP6HFQYQ7aZHBxJlzaoAuQToyNZbsoFsdEx9hq -GW6YkauhJjtrGghtPEZ12+vFxl6fvsxBM7KQPKGaety9Ihx20DDqofXLBt7lkiH81yxOVqHKsi5o -47T+ZSwjhKyJreIu1zVaXaMzYBBR50qruOO7wNIJUzoCeRDzJHTrJ0qtlsY1Eyuvy8YqPzwO+wIt -JSWuVCuDpEahlBH2KaXUfohrK6A0QZU6Q9NdZRgXLYZJ9E2sUU9eGeCnrrBp8HUEodSTAsQevAUs -FOjMdnYB5pnhps0fl9JfYP+pAbsffOc82fsPW8/DeQL7att4uhF6ghNOkcYY3j9sxCc9+Pzg +AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJlmHhdAAoJEEMdJKf2hr9ArGgP+wcb +of6dUliYw+yEP7FiBS8HN70/oV/SYRKhTGdsmX5xnbkWMIQ6y8eRmN2z2L3R7M6fVVzMRkZ4zvvf +rJtss8vAToxLmjZEKINEuLVZvZA574HzV49EUITrYs/X9pIX+fXbLEXS30vd5OH5/vZvxnmDAh6j +0WivCWwNVtk1v7ufrMXg2f//QO1XLKJO1DB+TGPqpeFjGB5cEyqLRZsf86N3Gxy+Lu+d1cNqLmEP +VSBfdTkA4ynl8U3GaD0/Bxc6YCZ0xY7Cvzoxx8ybqKOmaG9xPFDB3Ek/Ruyqtklx46wTVqG4RAfs +BGt6zGasPne5kqUA7KDyhG0lgKPVbmaTptYH9I9TvG3Plt5lTH/PUOaDh0xAUe8HjS5wshSBdtCS +4OmRvTmSOwff58H7z9eLXr3j2+p3hYSVuCCvjWQWWx/qbXCHC0IQKcO+JhOKcC2rspf1RfUhD+7R +dqhGtEYtUV1oWHMbXEqVAgDXB6FSMjjiCCGe9oRJB9Lq+BeNqVBbnfkRfbd4aua2BTea8cnq9DeI +Gb92A7I71UUokxiht0jqlQ9fxV8qmRGEGPYylE+Jxpk/WmlrQ6mDvfSPpAShidRhOQlfIT7H9fTb +q5QotnwJirGmfta0SbDFRmdh/daxse9//4rcBdZGcVw85lcfqae8rjhorwzC63lCiQUOZ3EK diff --git a/tests/lib/assertions/test-snapd-recovery-system-pc-22.json b/tests/lib/assertions/test-snapd-recovery-system-pc-22.json index 6e92d84a6915..ebe778a3cc8a 100644 --- a/tests/lib/assertions/test-snapd-recovery-system-pc-22.json +++ b/tests/lib/assertions/test-snapd-recovery-system-pc-22.json @@ -6,7 +6,7 @@ "model": "my-model", "revision": "1", "architecture": "amd64", - "timestamp": "2024-04-19T08:58:37+00:00", + "timestamp": "2024-01-04T15:49:41+00:00", "grade": "dangerous", "base": "core22", "serial-authority": ["generic"], @@ -24,7 +24,7 @@ "type": "kernel" }, { - "default-channel": "latest/beta", + "default-channel": "latest/stable", "id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT", "name": "core22", "type": "base" diff --git a/tests/lib/assertions/test-snapd-recovery-system-pc-22.model b/tests/lib/assertions/test-snapd-recovery-system-pc-22.model index 85c0ddb977b3..1cd2d21a6461 100644 --- a/tests/lib/assertions/test-snapd-recovery-system-pc-22.model +++ b/tests/lib/assertions/test-snapd-recovery-system-pc-22.model @@ -21,7 +21,7 @@ snaps: name: pc-kernel type: kernel - - default-channel: latest/beta + default-channel: latest/stable id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT name: core22 type: base @@ -46,16 +46,16 @@ snaps: - ephemeral name: hello-world type: app -timestamp: 2024-04-19T08:58:37+00:00 -sign-key-sha3-384: Dwtj-EPpm3Nh0t5OOaSz4nDgAr5ShnbPvIc89Q0F-LzxGbNWPgYEQ936W_vBigky +timestamp: 2024-01-04T15:49:41+00:00 +sign-key-sha3-384: 7qWG-Uwck6Dji43a3Z8ZZrm7rAziZAch3xf76iFvqe4GaD0LI7U9lYPWMSJAsEgu -AcLBcwQAAQoAHRYhBEqNlIFXB9LhztzSP90EciVbB6G9BQJmIjKAAAoJEN0EciVbB6G9o68QALRS -1PStejTNlT/lzeLm5Wmq+4zdk5XGRRwOuwU6FXIL81mBtQxpREkXbaK+4JpMEuLFhGbQ3Jzu7FZw -aHziYFTKuGSAHuCpA8jsl90y1ZYGSSIGwK661nkPVDAZhmliRM/SToBXcmMiXNb8IMq86t/AKRjh -IaGO8fI1/QbHzF83G5AGwidfqM1XQ94xTw4Yj9LcLQOZzL+r0dx/mIPZ77Del2N2Xnq52wULJ89k -rpnss0Fn9jmt08uH5x03i9LoJdHIYrToIYonbiMWIzrS4ApRtF28JHsrJAkhN50rOU/jjG+agJYM -5iu1Tv/1+TZUlgubO2+oE6vWC7sXuS1c7NsYU7MFTPRmlvf1/UXo+ojNsCzAEoxsKHicMIhfZ98m -RwNEIRhvcA9T3CkdCpUPmAm+4vOfaX0GY4RaDquK82blRXWbPn39ZntlUON8qj4m943BhGl81TAc -eEg++l6WM5CaCImKeSZUo8sihu0hO+4cwLm0njm3V1t/zGsw4/bE526KugyzsVVYM5ePKp6j78iH -hZbROOSaylW4tfwVo7D8+LzgpxbockgPowCodEaf7DS9C3Aj6NEChwKjEGZelEhVRSJCl5pQpFu+ -5G/0UTHGVhePSqeTHZohCziyV84MGG/iRCNV5RgPr8DPtRTHQ/dDSLT9/PcGPiy3yi6mUk63 +AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJl4gLjAAoJEEMdJKf2hr9ACKkP/12Z +uix52q9+WujCDSNlJthql1xBmN5/IccbUWOff4P2Zv3V3c0j5HMon5lnnfcPSu69Wv9L8JT0xdr+ +Ee5Blaqw9549dtwJ2JtMtCpJmNcKHXYleJQOIEVtK2zL5YvYDShUG1cx1gEIls7fiKAAbebtpKcv +uNbZZnxf3gGkIaqxSjJInv4t8Txd2BBlmMvIG0C7r/iWV93UYwPKm9FPRPWAFE4DauippViQkWGP +NbeZJ8D9/iWwEUuY21scCE+l7JcXpOjIhNFH34PnisfW050QNxCnfH6XUNmplfVGimWt9W7g+v7m +nSIWE/MoBCz8H0eaf9V8hroqy5vG+IqUg5Tb91FvLspc2lq1eRhei0DA/Ys47QLnVViOmHwgXGJY +pFBz52m6BEE67ByNN/U0DLeRT5AEl5CSZP4DFRfn+r/y3EHWQ10MXZ4zN7HQb7SMuxvRlx6FUl46 +TESmnS2U7QIToe9h31tKMTI1jNkgd22Y4h9aLT+FMNvUVrz49FN/5eLAkCy2oaUKnme8qv0VzTbp +W2Rv3cXgQqu1NhOK1QMTj+7kJUn4fi1/UAD8lo7K2G+FJdyznQKDcstLZnCsRr8+k9kp7yRjZzF6 +cgRHFrvtfsxUYfUFNN2nCZ7NWqVUdYgheoVc6suTUcQvuvx1lQAH2OvNJYu4DMI5cMffD0TJ