From 89cf62043d105eadadc3a4562e189e183c0a922a Mon Sep 17 00:00:00 2001
From: Sergio Cazzolato <sergio.cazzolato@canonical.com>
Date: Mon, 16 Sep 2024 10:57:07 -0300
Subject: [PATCH] tests: use oem instead of hwe kernel for hibryd-model test
 (#14477)

Hybrid-remodel test is failing and it is because the hwe kernel is
broken. The this change is to avoid using that kernel.
---
 .../assertions/classic-model-rev1-22.assert   | 22 +++++++++----------
 .../lib/assertions/classic-model-rev1-22.json |  2 +-
 .../assertions/classic-model-rev1-24.assert   | 22 +++++++++----------
 .../lib/assertions/classic-model-rev1-24.json |  2 +-
 tests/nested/manual/hybrid-remodel/task.yaml  |  2 +-
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/lib/assertions/classic-model-rev1-22.assert b/tests/lib/assertions/classic-model-rev1-22.assert
index 9ae954af384..396831eeff7 100644
--- a/tests/lib/assertions/classic-model-rev1-22.assert
+++ b/tests/lib/assertions/classic-model-rev1-22.assert
@@ -17,7 +17,7 @@ snaps:
     name: pc
     type: gadget
   -
-    default-channel: 22-hwe/stable
+    default-channel: 22-oem/stable
     name: pc-kernel
     type: kernel
   -
@@ -38,13 +38,13 @@ snaps:
 timestamp: 2023-11-09T07:50:10+00:00
 sign-key-sha3-384: 7qWG-Uwck6Dji43a3Z8ZZrm7rAziZAch3xf76iFvqe4GaD0LI7U9lYPWMSJAsEgu
 
-AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJlnX8XAAoJEEMdJKf2hr9AZ9wP/3gt
-bYcC60r4r4Vtnsy2K3L851vtyI+Lm+S/7X4dXtQhHHXTEkIbYUBnTyEtI2BDTQ8LF0LRuqK7Mb9n
-E4h+rJzxlp3X3c97FzRCw1ctaWcCQi97+VY0jmGW5Ytp0hSY0+f5rcQYXMtEGzpNGNOnwb6hS5MA
-pp5LmipRNHuC6Ss5assT2F6iCd+5aUnvfMkVlv+cM8EZ7Yd+SGGjtBTUryk98JqP29bdYIH4QvpQ
-17Y8DUKkCBzqyco3VT2Wk51Fbl+BKrL/vIqEWmSREj6MmhpJ9DSAptU9HmVj5HAY6T362zOwz7Py
-6OMy/Dxyf1W/eUm7CuQZ+uybnqZD5pCulbI5WX72kVNqjCJUGJWA61ApKVjMbWuUtIS9HuP1kDhy
-a7E6tB7C3NP7yr4qfG78euPW4bH3kzObvCPY0vf3/v0xXM7jho0fFlX+lg60Wq46haXHU/Jn7MTy
-D8HACuT9kY5YTQ9yiUQsMvon3CdA9Z7ViF0ff6+xrwnjAlqCIBop5AMLe4/gGgSa+njA4esHO4Ne
-j9ErTHIA+79CQjKuEgHCZ6xvvoNQuUdhonSf7xNvY+gCDfFotw53yGmJQy6klIAg1ufVjCNbnfqd
-7dGhTM0h3j7GG6sH3rcmdUyxQIgaU8E8fCQbL0jcLGIKwhPv7f9taxQAxlyZKDqsFX22eFU5
+AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJm2xVIAAoJEEMdJKf2hr9AFZcP/iNS
+P0VYXtrYRP4SXJnSws9MSvosF1Q6Zj4vKAddKAlswnu87/e6KaKw/xlFg5MfcgoWAjruU662sxPJ
+1X1f579LnPFm7OwnG5IiGKeK5LOtn1T9JADNwLYKQyXlwfiLaBaqPQ0PsXSYxx/v3AW7421sHK2V
+fHtUWSag/olAW+LqerRJsrgSg4UjxpItboej9wsOWzU6rCW9nDlSP4d3FsaYTlasurXUVegtW+XE
+UDdcQ07KLkpJk5PNIa9Ch55gwnMRRhI9eXhibh1L9xDQLtRigzxWQh7W8F08/WoFsywmLdihfUUM
+JUgT7z7t6MmahYVUy3vz7Fhtj5UZCET4UL89/NQ+XUVvjYcqBz0GRFXJ02yqVQNwBe8BvC8I1GQ9
+eQao+hEuJ2Zz51GV1IVkV0VITgo0APWqnF8DHAvTNlJ3rlViJHrbvW7qLxaIvv061Rj9IGE/2RNk
+nW/WZQw5XGPYLz5q00dKiW5/5yTcHkFFiCZBcJws2vKVtZdgr7ggkbApl3UIbWNuTc9Fz6UniVj5
+0MFFGS38bvfngTrHw9fn00zzgtaNGpsN9JmK3baC1qOU9c159vP3nlNkaDe21mpRHU6BX2tacCM9
+nQJetYmBebuUHXq/wl/T6fJNvQk42+u6b+68kx/KAl3udwfsiUF48WiRsHcChqNZQhpRsoCm
\ No newline at end of file
diff --git a/tests/lib/assertions/classic-model-rev1-22.json b/tests/lib/assertions/classic-model-rev1-22.json
index 859d4c6eae8..d92e840266c 100644
--- a/tests/lib/assertions/classic-model-rev1-22.json
+++ b/tests/lib/assertions/classic-model-rev1-22.json
@@ -23,7 +23,7 @@
         {
             "name": "pc-kernel",
             "type": "kernel",
-            "default-channel": "22-hwe/stable"
+            "default-channel": "22-oem/stable"
         },
         {
             "name": "core22",
diff --git a/tests/lib/assertions/classic-model-rev1-24.assert b/tests/lib/assertions/classic-model-rev1-24.assert
index 2d334f15e38..0e6448aa210 100644
--- a/tests/lib/assertions/classic-model-rev1-24.assert
+++ b/tests/lib/assertions/classic-model-rev1-24.assert
@@ -17,7 +17,7 @@ snaps:
     name: pc
     type: gadget
   -
-    default-channel: 24-hwe/stable
+    default-channel: 24-oem/stable
     name: pc-kernel
     type: kernel
   -
@@ -38,13 +38,13 @@ snaps:
 timestamp: 2024-08-02T00:00:00+00:00
 sign-key-sha3-384: 7qWG-Uwck6Dji43a3Z8ZZrm7rAziZAch3xf76iFvqe4GaD0LI7U9lYPWMSJAsEgu
 
-AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJmrOmQAAoJEEMdJKf2hr9A5l0P/iJF
-deI0WrNF6njZqlaFMGGO1yKlqpZGedZI7M4qV3y0nFMCrFILxvlNevY2YYEFdtODvz5ZfEJZmg9w
-J+ddyLeHb0Igd30u/DUxjBrxEW4coFNImVkJAqpNp1w3E/YNUBFwiMg2eadEBM6rkKEf+E3hkPql
-UivLKoaXZ2CMHlqFHW34bFMDhj1NdE9AUx077lTyy8Qc+Q/XNOy1Ybq3ldqgTvTdT6yxBXpQvHNH
-4nC5J/B3l/NXGVBdPYmvncZcHsNpREzTMmhu4rADqpPtweXtAV7r0Hqc9TcrvRb/VOwYerIOTIA+
-N0GQ5bxGUnRng900aOAtHIiAqME6LvTDCZVcfC3HBKtIFgM7b254eFslvLRLFJCELDen3+kEXBj0
-PVp1bKOd+ZExM8vKj18h+pfn/Ahy7PkzSqJLI4PvDOdiSx6GbbVoZCVgSrX3cgK2XQu181vJPlu+
-m55JaYAgHYwM0am6Fn+VyQfqPu471X7z3g0+kCCCN7Vb46VsZ6JRhqP/L2nkcyZhHrBtU4a1q8GN
-Qj3GpsnqCzGbLgCbzg/XjSJ6QsneLtWxdXHS6ozDNis3QsCCttkKiFo4tQh2wBRlnsMauoo91TQn
-a5TuoLKppJPcbTZHFvsApQHSwGalogt7x/oYhJrH5493Ta66XivTixFf9prjS3o0HOwnMhEV
\ No newline at end of file
+AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJm2xVeAAoJEEMdJKf2hr9AqyEQAIo9
+VXlntZZGLGO6zc+9z8DINfJkmjgOfmiZ01skJLPk4eP9SszLGodG+1XJozMekgIIGD4rpU2er3rO
+l9IFj5Q9lPHVXGtI2LIIaNMpqf7gijXZ5uY0Sjqh0po4G8XLjUxpDz+WbDNTX3tXXMAhDjFYmSWr
+mjbyFRp7SD0gu7mbdxTO4owobm9hSCZdCryLaw35N39e/MQYaxOLS0a/WllrewRniRAB1o3AQEMw
+8n1biVE9THLjeAIkaFywv5LjCKQFHb3NvfqTG3DKdqLsd8JoB7i6qFXn9Z4sEJVgNCrRm6VfuoRv
+SroeINjJQ09913gf7q+GAtv9Cuh5fnr8VRO1jr343UIRyxAHybsU4ebXpWwVRf0fUn2B+e9xV9rd
+eFFgyCk1C+sJWmVCsHLZez2g1PJdl6shn/dw73PZ7aPHPr9nyikgPKgDCyNWyzfrjHyVOibtMyRQ
+Gr4DL4w2mmoqoTnk7gsOJB61Ros5A/vrwwMzs573V3xoJgbMVAOdXhQ896hqbWdVLqECa+V/PO5X
+oKlZWWqi970nRtF/Xj0/6IYKxrZY1uYF3Nwpr9YOReGGOZE6T+nfVOwga7hBxKLDTNrK06PDuOA3
+euoe0EugTbYxhICfzNYTR9y+I+3Ggk4+Hg7Rlw+RR8lwFVTX8qfSDROs1ckl02mdRNczMFrp
\ No newline at end of file
diff --git a/tests/lib/assertions/classic-model-rev1-24.json b/tests/lib/assertions/classic-model-rev1-24.json
index fa27cc04700..e1b31a93d4e 100644
--- a/tests/lib/assertions/classic-model-rev1-24.json
+++ b/tests/lib/assertions/classic-model-rev1-24.json
@@ -23,7 +23,7 @@
         {
             "name": "pc-kernel",
             "type": "kernel",
-            "default-channel": "24-hwe/stable"
+            "default-channel": "24-oem/stable"
         },
         {
             "name": "core24",
diff --git a/tests/nested/manual/hybrid-remodel/task.yaml b/tests/nested/manual/hybrid-remodel/task.yaml
index 44595010de4..99673b8a51f 100644
--- a/tests/nested/manual/hybrid-remodel/task.yaml
+++ b/tests/nested/manual/hybrid-remodel/task.yaml
@@ -56,7 +56,7 @@ execute: |
   remote.exec 'snap changes' | MATCH "${change_id}\s+Done.+Refresh model assertion from revision 0 to 1"
 
   remote.exec "snap list" | MATCH "jq-core${VERSION}"
-  remote.exec 'snap list pc-kernel' | awk 'NR != 1 { print $4 }' | MATCH "${VERSION}-hwe/stable"
+  remote.exec 'snap list pc-kernel' | awk 'NR != 1 { print $4 }' | MATCH "${VERSION}-oem/stable"
 
   # TODO: once we support installing recovery systems during the hybrid install,
   # we should switch this test to use a gadget that does not use "system-seed-null"